Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

develop #30

Merged
cromer merged 55 commits from develop into master 2022-08-26 10:53:59 -04:00
Conversation 0 Commits 55 Files Changed 66 +24 -17
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 298298359b - Show all commits

1
godot/Main.tscn
View File

@ -9,3 +9,4 @@ script = ExtResource( 1 )
level = ExtResource( 2 ) level = ExtResource( 2 )
[node name="Monitor" parent="." instance=ExtResource( 3 )] [node name="Monitor" parent="." instance=ExtResource( 3 )]
enabled = true

40
godot/monitor/Monitor.gd
View File

@ -11,7 +11,6 @@ var start_time: int = 0
var started: bool = false var started: bool = false
var player: Dictionary = {} var player: Dictionary = {}
var level_id: int = 2 # PrototypeR
var os_id: int = 0 var os_id: int = 0
var godot_version: Dictionary = Engine.get_version_info() var godot_version: Dictionary = Engine.get_version_info()
var processor_count: int = OS.get_processor_count() var processor_count: int = OS.get_processor_count()
@ -21,8 +20,6 @@ var screen_size: Vector2 = OS.get_screen_size()
var machine_id: String = OS.get_unique_id() var machine_id: String = OS.get_unique_id()
var locale: String = OS.get_locale() var locale: String = OS.get_locale()
var game_version: String var game_version: String
var won: bool = false
var timestamp: int = OS.get_unix_time()
var frames: Array = [] var frames: Array = []
var coins: int = 0 var coins: int = 0
@ -79,7 +76,7 @@ func _ready() -> void:
player["rut"] = clean_rut(player["rut"]) player["rut"] = clean_rut(player["rut"])
game["player"] = player game["player"] = player
game["level_id"] = level_id game["level_id"] = 0
game["os_id"] = os_id game["os_id"] = os_id
game["godot_version"] = godot_version game["godot_version"] = godot_version
game["processor_count"] = processor_count game["processor_count"] = processor_count
@ -89,8 +86,8 @@ func _ready() -> void:
game["screen_dpi"] = screen_dpi game["screen_dpi"] = screen_dpi
game["screen_size"] = screen_size game["screen_size"] = screen_size
game["game_version"] = game_version game["game_version"] = game_version
game["won"] = won game["won"] = false
game["timestamp"] = timestamp game["timestamp"] = OS.get_unix_time()
game["frames"] = frames game["frames"] = frames
var err = $HTTPRequest.connect("request_completed", self, "_on_request_completed") var err = $HTTPRequest.connect("request_completed", self, "_on_request_completed")
@ -99,20 +96,25 @@ func _ready() -> void:
func _physics_process(_delta: float) -> void: func _physics_process(_delta: float) -> void:
if enabled and started: if enabled:
var frame = empty_frame.duplicate(true) if started:
frame["coins"] = coins var frame = empty_frame.duplicate(true)
frame["points"] = points frame["coins"] = coins
frame["fps"] = Engine.get_frames_per_second() frame["points"] = points
frame["elapsed_time"] = OS.get_ticks_msec() - start_time frame["fps"] = Engine.get_frames_per_second()
frame["elapsed_time"] = OS.get_ticks_msec() - start_time
var frame_objects = objects.duplicate() var frame_objects = objects.duplicate()
frame["objects"] = frame_objects frame["objects"] = frame_objects
frames.append(frame) frames.append(frame)
if Input.is_action_just_pressed("Send"): if Input.is_action_just_pressed("Send"):
send_data() stop_monitor()
send_data()
else:
if Input.is_action_just_pressed("Send"):
start_monitor()
func _object_created(name: String, state: String, position: Vector2, velocity: Vector2) -> void: func _object_created(name: String, state: String, position: Vector2, velocity: Vector2) -> void:
@ -132,6 +134,10 @@ func _object_removed(name: String) -> void:
func start_monitor() -> void: func start_monitor() -> void:
frames.clear()
game["level_id"] = 2 # PrototypeR
game["won"] = false
game["timestamp"] = OS.get_unix_time()
start_time = OS.get_ticks_msec() start_time = OS.get_ticks_msec()
started = true started = true