refactor: Whitespace removal from all .gd files (#494)
Co-authored-by: Balloonpopper <balloonpopper@git.com>
This commit is contained in:
@@ -13,7 +13,7 @@ func _test_basic() -> bool:
|
||||
say player "Test3" [test2]
|
||||
# Third group
|
||||
>
|
||||
|
||||
|
||||
say player "Test4"
|
||||
# Fourth group
|
||||
>
|
||||
@@ -22,41 +22,41 @@ func _test_basic() -> bool:
|
||||
say player TEST:"Test 7"
|
||||
"""
|
||||
var script = escoria.esc_compiler.compile(esc.split("\n"))
|
||||
|
||||
|
||||
var subject = script
|
||||
assert(subject is ESCScript)
|
||||
|
||||
|
||||
subject = script.events.keys()
|
||||
assert(subject.size() == 1)
|
||||
assert(subject[0] == "test")
|
||||
|
||||
|
||||
subject = script.events["test"].statements
|
||||
assert(subject.size() == 2)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0]
|
||||
assert(subject is ESCGroup)
|
||||
assert(subject.statements.size() == 4)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].statements[0]
|
||||
assert(subject is ESCCommand)
|
||||
assert(subject.name == "say")
|
||||
assert(subject.parameters.size() == 2)
|
||||
assert(subject.parameters[0] == "player")
|
||||
assert(subject.parameters[1] == '"Test"')
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].statements[1]
|
||||
assert(subject is ESCGroup)
|
||||
assert(subject.conditions.size() == 1)
|
||||
assert(subject.conditions[0] is ESCCondition)
|
||||
assert(subject.conditions[0].flag == "test")
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].statements[1].statements[0]
|
||||
assert(subject is ESCCommand)
|
||||
assert(subject.name == "say")
|
||||
assert(subject.parameters.size() == 2)
|
||||
assert(subject.parameters[0] == "player")
|
||||
assert(subject.parameters[1] == '"Test2 BLANK"')
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].statements[2]
|
||||
assert(subject is ESCCommand)
|
||||
assert(subject.name == "say")
|
||||
@@ -65,27 +65,27 @@ func _test_basic() -> bool:
|
||||
assert(subject.parameters[1] == '"Test3"')
|
||||
assert(subject.conditions.size() == 1)
|
||||
assert(subject.conditions[0].flag == "test2")
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].statements[3]
|
||||
assert(subject is ESCGroup)
|
||||
assert(subject.statements.size() == 1)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[1]
|
||||
assert(subject is ESCGroup)
|
||||
assert(subject.statements.size() == 3)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[1].statements[1]
|
||||
assert(subject is ESCCommand)
|
||||
assert(subject.name == "say")
|
||||
assert(subject.parameters[1] == '"Test 6"')
|
||||
|
||||
assert(subject.parameters[1] == '"Test 6"')
|
||||
|
||||
subject = script.events["test"].statements[1].statements[2]
|
||||
assert(subject is ESCCommand)
|
||||
assert(subject.name == "say")
|
||||
assert(subject.parameters[1] == "TEST:\"Test 7\"")
|
||||
|
||||
|
||||
return true
|
||||
|
||||
|
||||
|
||||
func _test_conditions() -> bool:
|
||||
var esc = """
|
||||
@@ -101,39 +101,39 @@ say player "Test" [eq flag 3,gt flag 5]
|
||||
say player "Test" [!eq flag 3]
|
||||
"""
|
||||
var script = escoria.esc_compiler.compile(esc.split("\n"))
|
||||
|
||||
|
||||
var subject = script.events["test"].statements[0]
|
||||
assert(subject is ESCCommand)
|
||||
assert(subject.conditions.size() == 1)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].conditions[0]
|
||||
assert(subject.flag == "flag")
|
||||
assert(not subject.negated)
|
||||
assert(not subject.inventory)
|
||||
assert(subject.comparison == ESCCondition.COMPARISON_NONE)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[1].conditions
|
||||
assert(subject.size() == 2)
|
||||
assert(subject[0].flag == "flag1")
|
||||
assert(subject[1].flag == "flag2")
|
||||
|
||||
|
||||
subject = script.events["test"].statements[2].conditions
|
||||
assert(subject.size() == 1)
|
||||
assert(subject[0].flag == "flag")
|
||||
assert(subject[0].negated)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[3].conditions
|
||||
assert(subject.size() == 1)
|
||||
assert(subject[0].flag == "flag")
|
||||
assert(subject[0].inventory)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[4].conditions
|
||||
assert(subject.size() == 2)
|
||||
assert(subject[0].flag == "flag")
|
||||
assert(subject[0].inventory)
|
||||
assert(subject[1].flag == "flag")
|
||||
assert(not subject[1].inventory)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[5].conditions
|
||||
assert(subject.size() == 3)
|
||||
assert(subject[0].flag == "flag")
|
||||
@@ -143,13 +143,13 @@ say player "Test" [!eq flag 3]
|
||||
assert(subject[2].flag == "flag2")
|
||||
assert(not subject[2].inventory)
|
||||
assert(subject[2].negated)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[6].conditions
|
||||
assert(subject.size() == 1)
|
||||
assert(subject[0].flag == "flag")
|
||||
assert(subject[0].comparison == ESCCondition.COMPARISON_EQ)
|
||||
assert(subject[0].comparison_value == 3)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[7].conditions
|
||||
assert(subject.size() == 2)
|
||||
assert(subject[0].flag == "flag")
|
||||
@@ -158,14 +158,14 @@ say player "Test" [!eq flag 3]
|
||||
assert(subject[1].flag == "flag")
|
||||
assert(subject[1].comparison == ESCCondition.COMPARISON_GT)
|
||||
assert(subject[1].comparison_value == 5)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[8].conditions
|
||||
assert(subject.size() == 1)
|
||||
assert(subject[0].flag == "flag")
|
||||
assert(subject[0].comparison == ESCCondition.COMPARISON_EQ)
|
||||
assert(subject[0].comparison_value == 3)
|
||||
assert(subject[0].negated)
|
||||
|
||||
|
||||
return true
|
||||
|
||||
|
||||
@@ -176,31 +176,31 @@ func _test_event_flags() -> bool:
|
||||
:test3 | TK NO_TT NO_UI
|
||||
"""
|
||||
var script = escoria.esc_compiler.compile(esc.split("\n"))
|
||||
|
||||
|
||||
var subject = script.events
|
||||
assert(subject.keys().size() == 3)
|
||||
assert("test" in subject.keys())
|
||||
assert("test2" in subject.keys())
|
||||
assert("test3" in subject.keys())
|
||||
|
||||
|
||||
subject = script.events["test"]
|
||||
assert(subject.name == "test")
|
||||
assert(subject.flags & ESCEvent.FLAG_TK != 0)
|
||||
assert(subject.flags & ESCEvent.FLAG_NO_TT == 0)
|
||||
|
||||
|
||||
subject = script.events["test2"]
|
||||
assert(subject.name == "test2")
|
||||
assert(subject.flags & ESCEvent.FLAG_TK != 0)
|
||||
assert(subject.flags & ESCEvent.FLAG_NO_TT != 0)
|
||||
|
||||
|
||||
subject = script.events["test3"]
|
||||
assert(subject.name == "test3")
|
||||
assert(subject.flags & ESCEvent.FLAG_TK != 0)
|
||||
assert(subject.flags & ESCEvent.FLAG_NO_TT != 0)
|
||||
assert(subject.flags & ESCEvent.FLAG_NO_UI != 0)
|
||||
|
||||
|
||||
return true
|
||||
|
||||
|
||||
|
||||
func _test_dialog() -> bool:
|
||||
var esc = """
|
||||
@@ -226,17 +226,17 @@ func _test_dialog() -> bool:
|
||||
!
|
||||
"""
|
||||
var script = escoria.esc_compiler.compile(esc.split("\n"))
|
||||
|
||||
|
||||
var subject = script.events["test"].statements
|
||||
assert(subject.size() == 1)
|
||||
|
||||
assert(subject[0] is ESCDialog)
|
||||
assert(subject[0].options.size() == 4)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].options[0]
|
||||
assert(subject is ESCDialogOption)
|
||||
assert(subject.option == "Option 1")
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].options[0].statements
|
||||
assert(subject.size() == 3)
|
||||
assert(subject[0] is ESCCommand)
|
||||
@@ -250,13 +250,13 @@ func _test_dialog() -> bool:
|
||||
assert(subject[2].name == "say")
|
||||
assert(subject[2].parameters.size() == 2)
|
||||
assert(subject[2].parameters[1] == '"testb?"')
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].options[1]
|
||||
assert(subject is ESCDialogOption)
|
||||
assert(subject.option == "Option 2")
|
||||
assert(subject.conditions.size() == 1)
|
||||
assert(subject.conditions[0].flag == "flag")
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].options[1].statements
|
||||
assert(subject.size() == 2)
|
||||
assert(subject[0] is ESCCommand)
|
||||
@@ -265,24 +265,24 @@ func _test_dialog() -> bool:
|
||||
|
||||
assert(subject[1] is ESCDialog)
|
||||
assert(subject[1].options.size() == 2)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].options[2]
|
||||
assert(subject is ESCDialogOption)
|
||||
assert(subject.option == "Option 3")
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].options[2].statements
|
||||
assert(subject.size() == 1)
|
||||
assert(subject[0] is ESCGroup)
|
||||
assert(subject[0].statements.size() == 1)
|
||||
assert(subject[0].statements[0] is ESCCommand)
|
||||
assert(subject[0].statements[0].parameters.size() == 2)
|
||||
|
||||
|
||||
subject = script.events["test"].statements[0].options[3]
|
||||
assert(subject is ESCDialogOption)
|
||||
assert(subject.option == "TEST")
|
||||
|
||||
|
||||
return true
|
||||
|
||||
|
||||
|
||||
func _on_BasicFunctionality_pressed():
|
||||
$VBoxContainer/VBoxContainer/BasicFunctionality.pressed = self._test_basic()
|
||||
|
||||
@@ -4,9 +4,9 @@ extends Control
|
||||
|
||||
func _on_CheckESCMigrationManager_pressed() -> bool:
|
||||
var savegame: ESCSaveGame = ESCSaveGame.new()
|
||||
|
||||
|
||||
savegame.globals["test"] = "testa"
|
||||
|
||||
|
||||
var migration_manager: ESCMigrationManager = ESCMigrationManager.new()
|
||||
savegame = migration_manager.migrate(
|
||||
savegame,
|
||||
@@ -14,7 +14,7 @@ func _on_CheckESCMigrationManager_pressed() -> bool:
|
||||
"2.0.0",
|
||||
"res://addons/escoria-core/_test/testversions"
|
||||
)
|
||||
|
||||
|
||||
assert(savegame.globals["test"] == "testc")
|
||||
|
||||
|
||||
return true
|
||||
|
||||
Reference in New Issue
Block a user