diff --git a/README.md b/README.md index 9e22dce..697ec0b 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Ideas for characters: - More active - Blink (Tracer) - no cooldown, but loses all speed on hitting walls - Heavy guy - Slow, but very heavy for the see-saw + - Flying, of course - More supportive - Merge - combines with someone to boost their speed - Boost - Area of effect or zarya-like cast, speeds people up diff --git a/assets/DejaVuSansMono.ttf b/assets/DejaVuSansMono.ttf new file mode 100644 index 0000000..da5abdd Binary files /dev/null and b/assets/DejaVuSansMono.ttf differ diff --git a/bootstrap.py b/bootstrap.py new file mode 100644 index 0000000..5f10cea --- /dev/null +++ b/bootstrap.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python + +import os + +if os.path.exists("project.godot"): + # Update + os.system("git pull") + os.system("godot") +else: + # Initial download + os.system("git clone --depth 1 https://github.com/CosineGaming/nv-moba .") + os.system("godot") diff --git a/plans.md b/plans.md new file mode 100644 index 0000000..0a24584 --- /dev/null +++ b/plans.md @@ -0,0 +1,9 @@ +Big ideas: + +Smaller TODOs: +- Make see-saw not as buggy + - Do we need to return players to being rigidbodies? we probably do for that see-saw but i don't wanna :( + +When you have a workable demo: @mention @turion@mastodon.art + + diff --git a/scenes/player.tscn b/scenes/player.tscn index 08a1e25..09ad850 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -97,6 +97,8 @@ mouse_filter = 2 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 4 +text = "+" +align = 1 percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 diff --git a/scenes/world.tscn b/scenes/world.tscn index 28f13d9..66d332c 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://assets/player.obj" type="ArrayMesh" id=1] [ext_resource path="res://assets/maze.obj" type="ArrayMesh" id=2] @@ -7,11 +7,11 @@ data = PoolVector3Array( -85.5, -0.4712, 11.2734, -43.5, -0.4712, 11.2734, -85.5, 3.666, 11.2734, -85.5, 3.666, 11.2734, -43.5, -0.4712, 11.2734, -43.5, 3.666, 11.2734, 0.9995, -0.4712, 11.2734, 1, -1, 11.2734, 0.9995, -0.4712, 12.0469, 0.9995, -0.4712, 12.0469, 1, -1, 11.2734, 1, -1, 12.0469, -85.5, -0.4712, 2.0469, -85.5625, -0.4712, 6.3008, -85.5, -0.4712, 7.4102, -48.5938, -1, -3.5098, -64.6875, -0.4712, -3.5098, -85.5, -1, -3.5098, -85.5, -1, -3.5098, -64.6875, -0.4712, -3.5098, -85.5, -0.4712, -3.5098, 1, -0.4712, 7.4102, 1, -1, 6.7578, 0.9995, -0.4712, 11.2734, 0.9995, -0.4712, 11.2734, 1, -1, 6.7578, 1, -1, 11.2734, 0.9995, -0.4712, 11.2734, 0.9995, -0.4712, 12.0469, 0.9995, 3.666, 11.2734, 0.9995, 3.666, 11.2734, 0.9995, -0.4712, 12.0469, 0.9995, 3.666, 12.0469, -85.5, -0.4712, -2.6992, -85.5, -0.4712, -3.5098, -85.5, 3.8457, -2.6992, -85.5, 3.8457, -2.6992, -85.5, -0.4712, -3.5098, -85.5, 3.8457, -3.5098, 1, -0.4712, -3.5098, 1, -1, -3.5098, 1, -0.4712, -2.6992, 1, -0.4712, -2.6992, 1, -1, -3.5098, 1, -1, -2.6992, -85.5, 3.8457, -3.5098, -64.6875, 3.8457, -3.5098, -85.5, 3.8457, -2.6992, -85.5, 3.8457, -2.6992, -64.6875, 3.8457, -3.5098, -64.6875, 3.8457, -2.6992, 1, -0.4712, -2.6992, -14.0469, -0.4712, -2.6992, 1, 3.8457, -2.6992, 1, 3.8457, -2.6992, -14.0469, -0.4712, -2.6992, -14.0469, 3.8457, -2.6992, -85.5, -0.4712, -3.5098, -64.6875, -0.4712, -3.5098, -85.5, 3.8457, -3.5098, -85.5, 3.8457, -3.5098, -64.6875, -0.4712, -3.5098, -64.6875, 3.8457, -3.5098, 1, -0.4712, -3.5098, 1, -0.4712, -2.6992, 1, 3.8457, -3.5098, 1, 3.8457, -3.5098, 1, -0.4712, -2.6992, 1, 3.8457, -2.6992, 1, -0.4712, 6.3008, 1, -1, 5.8477, 1, -0.4712, 7.4102, 1, -0.4712, 7.4102, 1, -1, 5.8477, 1, -1, 6.7578, 1, -0.4712, -2.6992, 1, -1, -2.6992, 1, -0.4712, 1.0459, 1, -0.4712, 1.0459, 1, -1, -2.6992, 1, -1, 1.249, -85.5, -0.4712, -2.6992, -64.6875, -0.4712, -2.6992, -85.5, -0.4712, 1.0459, -85.5, -0.4712, 1.0459, -64.6875, -0.4712, -2.6992, -64.625, -0.4712, 1.0459, 1, -0.4712, 2.0469, 1, -1, 2.375, 1, -0.4712, 6.3008, 1, -0.4712, 6.3008, 1, -1, 2.375, 1, -1, 5.8477, 1, -0.4712, 1.0459, 1, -1, 1.249, 1, -0.4712, 2.0469, 1, -0.4712, 2.0469, 1, -1, 1.249, 1, -1, 2.375, -101.75, -1, -3.5098, -101.75, -0.4712, -3.5098, -102.438, -1, -3.5098, -102.438, -1, -3.5098, -101.75, -0.4712, -3.5098, -102.438, -0.4712, -3.5098, 1, -0.4712, 1.0459, 1, -0.4712, 2.0469, 1, 3.7734, 1.0459, 1, 3.7734, 1.0459, 1, -0.4712, 2.0469, 1, 3.7734, 2.0469, -36.9063, -0.4712, 11.2734, -31.2031, -0.4712, 11.2734, -36.9063, 3.666, 11.2734, -36.9063, 3.666, 11.2734, -31.2031, -0.4712, 11.2734, -31.2031, 3.666, 11.2734, -31.2031, -1, -3.5098, -31.2031, -0.4712, -3.5098, -36.9063, -1, -3.5098, -36.9063, -1, -3.5098, -31.2031, -0.4712, -3.5098, -36.9063, -0.4712, -3.5098, -36.9063, -0.4712, 7.4102, -31.2031, -0.4712, 7.4102, -36.9063, -0.4712, 11.2734, -36.9063, -0.4712, 11.2734, -31.2031, -0.4712, 7.4102, -31.2031, -0.4712, 11.2734, -85.5, 3.7734, 1.0459, -64.625, 3.7734, 1.0459, -85.5, 3.7734, 2.0469, -85.5, 3.7734, 2.0469, -64.625, 3.7734, 1.0459, -64.625, 3.7734, 2.0469, -85.5, -0.4712, 2.0469, -85.5, -0.4712, 1.0459, -85.5, 3.7734, 2.0469, -85.5, 3.7734, 2.0469, -85.5, -0.4712, 1.0459, -85.5, 3.7734, 1.0459, 1, -0.4712, 6.3008, 1, -0.4712, 7.4102, 1, 3.7734, 6.3008, 1, 3.7734, 6.3008, 1, -0.4712, 7.4102, 1, 3.7734, 7.4102, 1, -0.4712, 2.0469, -14.0469, -0.4712, 2.0469, 1, 3.7734, 2.0469, 1, 3.7734, 2.0469, -14.0469, -0.4712, 2.0469, -14.0469, 3.7734, 2.0469, -85.5, -0.4712, 1.0459, -64.625, -0.4712, 1.0459, -85.5, 3.7734, 1.0459, -85.5, 3.7734, 1.0459, -64.625, -0.4712, 1.0459, -64.625, 3.7734, 1.0459, 1, -0.4712, 7.4102, -14.0469, -0.4712, 7.4102, 1, 3.7734, 7.4102, 1, 3.7734, 7.4102, -14.0469, -0.4712, 7.4102, -14.0469, 3.7734, 7.4102, -14.0469, -0.4712, 1.0459, 1, -0.4712, 1.0459, -14.0469, 3.7734, 1.0459, -14.0469, 3.7734, 1.0459, 1, -0.4712, 1.0459, 1, 3.7734, 1.0459, -14.0469, -0.4712, 6.3008, 1, -0.4712, 6.3008, -14.0469, 3.7734, 6.3008, -14.0469, 3.7734, 6.3008, 1, -0.4712, 6.3008, 1, 3.7734, 6.3008, -14.0469, -0.4712, 2.0469, -19.7813, -0.4712, 2.0469, -14.0469, 3.7734, 2.0469, -14.0469, 3.7734, 2.0469, -19.7813, -0.4712, 2.0469, -19.7813, 3.7734, 2.0469, -14.0469, 3.7734, 1.0459, 1, 3.7734, 1.0459, -14.0469, 3.7734, 2.0469, -14.0469, 3.7734, 2.0469, 1, 3.7734, 1.0459, 1, 3.7734, 2.0469, -14.0469, 3.7734, 6.3008, 1, 3.7734, 6.3008, -14.0469, 3.7734, 7.4102, -14.0469, 3.7734, 7.4102, 1, 3.7734, 6.3008, 1, 3.7734, 7.4102, -36.9063, 3.666, 11.2734, -31.2031, 3.666, 11.2734, -36.9063, 3.666, 12.0469, -36.9063, 3.666, 12.0469, -31.2031, 3.666, 11.2734, -31.2031, 3.666, 12.0469, -36.9063, 3.8457, -3.5098, -31.2031, 3.8457, -3.5098, -36.9063, 3.8457, -2.6992, -36.9063, 3.8457, -2.6992, -31.2031, 3.8457, -3.5098, -31.2031, 3.8457, -2.6992, -14.0469, -0.4712, 2.0469, 1, -0.4712, 2.0469, -14.0469, -0.4712, 6.3008, -14.0469, -0.4712, 6.3008, 1, -0.4712, 2.0469, 1, -0.4712, 6.3008, -14.0469, -0.4712, -2.6992, 1, -0.4712, -2.6992, -14.0469, -0.4712, 1.0459, -14.0469, -0.4712, 1.0459, 1, -0.4712, -2.6992, 1, -0.4712, 1.0459, -14.0469, -0.4712, -3.5098, 1, -0.4712, -3.5098, -14.0469, 3.8457, -3.5098, -14.0469, 3.8457, -3.5098, 1, -0.4712, -3.5098, 1, 3.8457, -3.5098, -14.0469, -0.4712, -2.6992, -19.7813, -0.4712, -2.6992, -14.0469, 3.8457, -2.6992, -14.0469, 3.8457, -2.6992, -19.7813, -0.4712, -2.6992, -19.7813, 3.8457, -2.6992, -14.0469, 3.8457, -3.5098, 1, 3.8457, -3.5098, -14.0469, 3.8457, -2.6992, -14.0469, 3.8457, -2.6992, 1, 3.8457, -3.5098, 1, 3.8457, -2.6992, -14.0469, 3.666, 11.2734, 0.9995, 3.666, 11.2734, -14.0469, 3.666, 12.0469, -14.0469, 3.666, 12.0469, 0.9995, 3.666, 11.2734, 0.9995, 3.666, 12.0469, -14.0469, -0.4712, 7.4102, 1, -0.4712, 7.4102, -14.0469, -0.4712, 11.2734, -14.0469, -0.4712, 11.2734, 1, -0.4712, 7.4102, 0.9995, -0.4712, 11.2734, 1, -1, -3.5098, 1, -0.4712, -3.5098, -14.0469, -1, -3.5098, -14.0469, -1, -3.5098, 1, -0.4712, -3.5098, -14.0469, -0.4712, -3.5098, -14.0469, -0.4712, 11.2734, 0.9995, -0.4712, 11.2734, -14.0469, 3.666, 11.2734, -14.0469, 3.666, 11.2734, 0.9995, -0.4712, 11.2734, 0.9995, 3.666, 11.2734, -36.9063, -1, -3.5098, -44.3125, -1, -3.5098, -31.2031, -1, -3.5098, -31.2031, -1, -3.5098, -44.3125, -1, -3.5098, -30.1563, -1, -3.5098, -30.1563, -1, -3.5098, -44.3125, -1, -3.5098, -25.75, -1, -3.5098, -25.75, -1, -3.5098, -44.3125, -1, -3.5098, -19.7813, -1, -3.5098, -19.7813, -1, -3.5098, -44.3125, -1, -3.5098, -14.0469, -1, -3.5098, -14.0469, -1, -3.5098, -44.3125, -1, -3.5098, 1, -1, -3.5098, 1, -1, -3.5098, -44.3125, -1, -3.5098, 1, -1, -2.6992, 1, -1, -2.6992, -44.3125, -1, -3.5098, 1, -1, 1.249, 1, -1, 1.249, -44.3125, -1, -3.5098, 1, -1, 2.375, 1, -1, 2.375, -44.3125, -1, -3.5098, 1, -1, 5.8477, 1, -1, 5.8477, -44.3125, -1, -3.5098, 1, -1, 6.7578, 1, -1, 6.7578, -44.3125, -1, -3.5098, 1, -1, 11.2734, 1, -1, 11.2734, -44.3125, -1, -3.5098, 1, -1, 12.0469, 1, -1, 12.0469, -44.3125, -1, -3.5098, -85.5, -1, 12.0469, -85.5, -1, 12.0469, -44.3125, -1, -3.5098, -101.75, -1, 12.0469, -101.75, -1, 12.0469, -44.3125, -1, -3.5098, -101.75, -1, -3.5098, -101.75, -1, -3.5098, -44.3125, -1, -3.5098, -85.5, -1, -3.5098, -85.5, -1, -3.5098, -44.3125, -1, -3.5098, -48.5938, -1, -3.5098, -19.7813, -0.4712, -2.6992, -25.75, -0.4712, -2.6992, -19.7813, 3.8457, -2.6992, -19.7813, 3.8457, -2.6992, -25.75, -0.4712, -2.6992, -25.75, 3.8457, -2.6992, -36.9063, -0.4712, -3.5098, -31.2031, -0.4712, -3.5098, -36.9063, 3.8457, -3.5098, -36.9063, 3.8457, -3.5098, -31.2031, -0.4712, -3.5098, -31.2031, 3.8457, -3.5098, -19.7813, -0.4712, 2.0469, -21.0625, -0.4712, 2.0469, -19.7813, 3.7734, 2.0469, -19.7813, 3.7734, 2.0469, -21.0625, -0.4712, 2.0469, -21.0625, 3.7734, 2.0469, -19.7813, -0.4712, 7.4102, -25.75, -0.4712, 7.4102, -19.7813, 3.7734, 7.4102, -19.7813, 3.7734, 7.4102, -25.75, -0.4712, 7.4102, -25.75, 3.7734, 7.4102, -19.7813, -0.4712, 1.0459, -14.0469, -0.4712, 1.0459, -19.7813, 3.7734, 1.0459, -19.7813, 3.7734, 1.0459, -14.0469, -0.4712, 1.0459, -14.0469, 3.7734, 1.0459, -19.7813, 3.7734, 1.0459, -14.0469, 3.7734, 1.0459, -19.7813, 3.7734, 2.0469, -19.7813, 3.7734, 2.0469, -14.0469, 3.7734, 1.0459, -14.0469, 3.7734, 2.0469, -36.9063, -0.4712, -2.6992, -31.2031, -0.4712, -2.6992, -36.9063, -0.4712, 1.0459, -36.9063, -0.4712, 1.0459, -31.2031, -0.4712, -2.6992, -31.2031, -0.4712, 1.0459, -19.7813, -0.4712, 2.0469, -14.0469, -0.4712, 2.0469, -19.7813, -0.4712, 6.3008, -19.7813, -0.4712, 6.3008, -14.0469, -0.4712, 2.0469, -14.0469, -0.4712, 6.3008, -19.7813, -0.4712, -2.6992, -14.0469, -0.4712, -2.6992, -19.7813, -0.4712, 1.0459, -19.7813, -0.4712, 1.0459, -14.0469, -0.4712, -2.6992, -14.0469, -0.4712, 1.0459, -19.7813, -0.4712, -3.5098, -14.0469, -0.4712, -3.5098, -19.7813, 3.8457, -3.5098, -19.7813, 3.8457, -3.5098, -14.0469, -0.4712, -3.5098, -14.0469, 3.8457, -3.5098, -19.7813, 3.8457, -3.5098, -14.0469, 3.8457, -3.5098, -19.7813, 3.8457, -2.6992, -19.7813, 3.8457, -2.6992, -14.0469, 3.8457, -3.5098, -14.0469, 3.8457, -2.6992, -19.7813, 3.666, 11.2734, -14.0469, 3.666, 11.2734, -19.7813, 3.666, 12.0469, -19.7813, 3.666, 12.0469, -14.0469, 3.666, 11.2734, -14.0469, 3.666, 12.0469, -19.7813, -0.4712, 7.4102, -14.0469, -0.4712, 7.4102, -19.7813, -0.4712, 11.2734, -19.7813, -0.4712, 11.2734, -14.0469, -0.4712, 7.4102, -14.0469, -0.4712, 11.2734, -14.0469, -1, -3.5098, -14.0469, -0.4712, -3.5098, -19.7813, -1, -3.5098, -19.7813, -1, -3.5098, -14.0469, -0.4712, -3.5098, -19.7813, -0.4712, -3.5098, -19.7813, -0.4712, 11.2734, -14.0469, -0.4712, 11.2734, -19.7813, 3.666, 11.2734, -19.7813, 3.666, 11.2734, -14.0469, -0.4712, 11.2734, -14.0469, 3.666, 11.2734, -14.0469, 3.7734, 6.3008, -14.0469, 3.7734, 7.4102, -14.0469, -0.4712, 6.3008, -14.0469, -0.4712, 6.3008, -14.0469, 3.7734, 7.4102, -14.0469, -0.4712, 7.4102, -14.0469, -0.4712, 6.3008, -14.0469, -0.4712, 7.4102, -19.7813, -0.4712, 6.3008, -19.7813, -0.4712, 6.3008, -14.0469, -0.4712, 7.4102, -19.7813, -0.4712, 7.4102, -19.7813, -0.4712, 7.4102, -19.7813, 3.7734, 7.4102, -19.7813, -0.4712, 6.3008, -19.7813, -0.4712, 6.3008, -19.7813, 3.7734, 7.4102, -19.7813, 3.7734, 6.3008, -30.1563, -0.4712, 6.3008, -30.1563, -0.4712, 7.4102, -30.1563, 3.7734, 6.3008, -30.1563, 3.7734, 6.3008, -30.1563, -0.4712, 7.4102, -30.1563, 3.7734, 7.4102, -25.0469, -0.4712, 1.0459, -21.0625, -0.4712, 1.0459, -25.0469, -0.4712, 2.0469, -25.0469, -0.4712, 2.0469, -21.0625, -0.4712, 1.0459, -21.0625, -0.4712, 2.0469, -36.9063, -0.4712, 2.0469, -31.2031, -0.4712, 2.0469, -36.9063, -0.4712, 6.3008, -36.9063, -0.4712, 6.3008, -31.2031, -0.4712, 2.0469, -31.2031, -0.4712, 6.3008, -25.75, -0.4712, -2.6992, -30.1563, -0.4712, -2.6992, -25.75, 3.8457, -2.6992, -25.75, 3.8457, -2.6992, -30.1563, -0.4712, -2.6992, -30.1563, 3.8457, -2.6992, -21.0625, -0.4712, 1.0459, -19.7813, -0.4712, 1.0459, -21.0625, 3.7734, 1.0459, -21.0625, 3.7734, 1.0459, -19.7813, -0.4712, 1.0459, -19.7813, 3.7734, 1.0459, -25.75, -0.4712, 6.3008, -19.7813, -0.4712, 6.3008, -25.75, 3.7734, 6.3008, -25.75, 3.7734, 6.3008, -19.7813, -0.4712, 6.3008, -19.7813, 3.7734, 6.3008, -21.0625, 3.7734, 1.0459, -19.7813, 3.7734, 1.0459, -21.0625, 3.7734, 2.0469, -21.0625, 3.7734, 2.0469, -19.7813, 3.7734, 1.0459, -19.7813, 3.7734, 2.0469, -25.75, 3.7734, 6.3008, -19.7813, 3.7734, 6.3008, -25.75, 3.7734, 7.4102, -25.75, 3.7734, 7.4102, -19.7813, 3.7734, 6.3008, -19.7813, 3.7734, 7.4102, -36.9063, 3.7734, 6.3008, -31.2031, 3.7734, 6.3008, -36.9063, 3.7734, 7.4102, -36.9063, 3.7734, 7.4102, -31.2031, 3.7734, 6.3008, -31.2031, 3.7734, 7.4102, -21.0625, -0.4712, 2.0469, -19.7813, -0.4712, 2.0469, -25.75, -0.4712, 6.3008, -25.75, -0.4712, 6.3008, -19.7813, -0.4712, 2.0469, -19.7813, -0.4712, 6.3008, -25.75, -0.4712, -2.6992, -19.7813, -0.4712, -2.6992, -21.0625, -0.4712, 1.0459, -21.0625, -0.4712, 1.0459, -19.7813, -0.4712, -2.6992, -19.7813, -0.4712, 1.0459, -25.75, -0.4712, -3.5098, -19.7813, -0.4712, -3.5098, -25.75, 3.8457, -3.5098, -25.75, 3.8457, -3.5098, -19.7813, -0.4712, -3.5098, -19.7813, 3.8457, -3.5098, -25.75, 3.8457, -3.5098, -19.7813, 3.8457, -3.5098, -25.75, 3.8457, -2.6992, -25.75, 3.8457, -2.6992, -19.7813, 3.8457, -3.5098, -19.7813, 3.8457, -2.6992, -25.75, 3.666, 11.2734, -19.7813, 3.666, 11.2734, -25.75, 3.666, 12.0469, -25.75, 3.666, 12.0469, -19.7813, 3.666, 11.2734, -19.7813, 3.666, 12.0469, -25.75, -0.4712, 7.4102, -19.7813, -0.4712, 7.4102, -25.75, -0.4712, 11.2734, -25.75, -0.4712, 11.2734, -19.7813, -0.4712, 7.4102, -19.7813, -0.4712, 11.2734, -19.7813, -1, -3.5098, -19.7813, -0.4712, -3.5098, -25.75, -1, -3.5098, -25.75, -1, -3.5098, -19.7813, -0.4712, -3.5098, -25.75, -0.4712, -3.5098, -25.75, -0.4712, 11.2734, -19.7813, -0.4712, 11.2734, -25.75, 3.666, 11.2734, -25.75, 3.666, 11.2734, -19.7813, -0.4712, 11.2734, -19.7813, 3.666, 11.2734, -30.1563, -0.4712, -2.6992, -31.2031, -0.4712, -2.6992, -30.1563, 3.8457, -2.6992, -30.1563, 3.8457, -2.6992, -31.2031, -0.4712, -2.6992, -31.2031, 3.8457, -2.6992, -36.9063, 3.7734, 1.0459, -31.2031, 3.7734, 1.0459, -36.9063, 3.7734, 2.0469, -36.9063, 3.7734, 2.0469, -31.2031, 3.7734, 1.0459, -31.2031, 3.7734, 2.0469, -36.9063, -0.4712, 6.3008, -31.2031, -0.4712, 6.3008, -36.9063, 3.7734, 6.3008, -36.9063, 3.7734, 6.3008, -31.2031, -0.4712, 6.3008, -31.2031, 3.7734, 6.3008, -25.0469, -0.4712, 2.0469, -31.2031, -0.4712, 2.0469, -25.0469, 3.7734, 2.0469, -25.0469, 3.7734, 2.0469, -31.2031, -0.4712, 2.0469, -31.2031, 3.7734, 2.0469, -30.1563, -0.4712, 7.4102, -31.2031, -0.4712, 7.4102, -30.1563, 3.7734, 7.4102, -30.1563, 3.7734, 7.4102, -31.2031, -0.4712, 7.4102, -31.2031, 3.7734, 7.4102, -25.75, -0.4712, 6.3008, -25.75, -0.4712, 7.4102, -30.1563, -0.4712, 6.3008, -30.1563, -0.4712, 6.3008, -25.75, -0.4712, 7.4102, -30.1563, -0.4712, 7.4102, -25.0469, -0.4712, 2.0469, -25.0469, 3.7734, 2.0469, -25.0469, -0.4712, 1.0459, -25.0469, -0.4712, 1.0459, -25.0469, 3.7734, 2.0469, -25.0469, 3.7734, 1.0459, -25.75, 3.7734, 7.4102, -25.75, -0.4712, 7.4102, -25.75, 3.7734, 6.3008, -25.75, 3.7734, 6.3008, -25.75, -0.4712, 7.4102, -25.75, -0.4712, 6.3008, -36.9063, -0.4712, 1.0459, -31.2031, -0.4712, 1.0459, -36.9063, 3.7734, 1.0459, -36.9063, 3.7734, 1.0459, -31.2031, -0.4712, 1.0459, -31.2031, 3.7734, 1.0459, -21.0625, 3.7734, 2.0469, -21.0625, -0.4712, 2.0469, -21.0625, 3.7734, 1.0459, -21.0625, 3.7734, 1.0459, -21.0625, -0.4712, 2.0469, -21.0625, -0.4712, 1.0459, -25.0469, -0.4712, 2.0469, -21.0625, -0.4712, 2.0469, -30.1563, -0.4712, 6.3008, -30.1563, -0.4712, 6.3008, -21.0625, -0.4712, 2.0469, -25.75, -0.4712, 6.3008, -30.1563, -0.4712, -2.6992, -25.75, -0.4712, -2.6992, -25.0469, -0.4712, 1.0459, -25.0469, -0.4712, 1.0459, -25.75, -0.4712, -2.6992, -21.0625, -0.4712, 1.0459, -30.1563, -0.4712, -3.5098, -25.75, -0.4712, -3.5098, -30.1563, 3.8457, -3.5098, -30.1563, 3.8457, -3.5098, -25.75, -0.4712, -3.5098, -25.75, 3.8457, -3.5098, -30.1563, 3.8457, -3.5098, -25.75, 3.8457, -3.5098, -30.1563, 3.8457, -2.6992, -30.1563, 3.8457, -2.6992, -25.75, 3.8457, -3.5098, -25.75, 3.8457, -2.6992, -30.1563, 3.666, 11.2734, -25.75, 3.666, 11.2734, -30.1563, 3.666, 12.0469, -30.1563, 3.666, 12.0469, -25.75, 3.666, 11.2734, -25.75, 3.666, 12.0469, -30.1563, -0.4712, 7.4102, -25.75, -0.4712, 7.4102, -30.1563, -0.4712, 11.2734, -30.1563, -0.4712, 11.2734, -25.75, -0.4712, 7.4102, -25.75, -0.4712, 11.2734, -25.75, -1, -3.5098, -25.75, -0.4712, -3.5098, -30.1563, -1, -3.5098, -30.1563, -1, -3.5098, -25.75, -0.4712, -3.5098, -30.1563, -0.4712, -3.5098, -43.5, -0.4712, 12.0469, -39.25, -0.4712, 12.0469, -85.5, -0.4712, 12.0469, -85.5, -0.4712, 12.0469, -39.25, -0.4712, 12.0469, -85.5, -1, 12.0469, -85.5, -1, 12.0469, -39.25, -0.4712, 12.0469, 1, -1, 12.0469, 1, -1, 12.0469, -39.25, -0.4712, 12.0469, 0.9995, -0.4712, 12.0469, 0.9995, -0.4712, 12.0469, -39.25, -0.4712, 12.0469, 0.9995, 3.666, 12.0469, 0.9995, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -14.0469, 3.666, 12.0469, -14.0469, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -19.7813, 3.666, 12.0469, -19.7813, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -25.75, 3.666, 12.0469, -25.75, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -30.1563, 3.666, 12.0469, -30.1563, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -31.2031, 3.666, 12.0469, -31.2031, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -36.9063, 3.666, 12.0469, -36.9063, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -39.25, 3.666, 12.0469, -30.1563, -0.4712, 11.2734, -25.75, -0.4712, 11.2734, -30.1563, 3.666, 11.2734, -30.1563, 3.666, 11.2734, -25.75, -0.4712, 11.2734, -25.75, 3.666, 11.2734, -31.2031, -0.4712, 7.4102, -36.9063, -0.4712, 7.4102, -31.2031, 3.7734, 7.4102, -31.2031, 3.7734, 7.4102, -36.9063, -0.4712, 7.4102, -36.9063, 3.7734, 7.4102, -31.2031, -0.4712, 2.0469, -36.9063, -0.4712, 2.0469, -31.2031, 3.7734, 2.0469, -31.2031, 3.7734, 2.0469, -36.9063, -0.4712, 2.0469, -36.9063, 3.7734, 2.0469, -36.9063, -0.4712, 7.4102, -50.2813, -0.4712, 7.4102, -36.9063, 3.7734, 7.4102, -36.9063, 3.7734, 7.4102, -50.2813, -0.4712, 7.4102, -50.2813, 3.7734, 7.4102, -36.9063, -0.4712, 2.0469, -60.4063, -0.4712, 2.0469, -36.9063, 3.7734, 2.0469, -36.9063, 3.7734, 2.0469, -60.4063, -0.4712, 2.0469, -60.4063, 3.7734, 2.0469, -31.2031, -0.4712, -2.6992, -36.9063, -0.4712, -2.6992, -31.2031, 3.8457, -2.6992, -31.2031, 3.8457, -2.6992, -36.9063, -0.4712, -2.6992, -36.9063, 3.8457, -2.6992, -31.2031, -0.4712, 1.0459, -25.0469, -0.4712, 1.0459, -31.2031, 3.7734, 1.0459, -31.2031, 3.7734, 1.0459, -25.0469, -0.4712, 1.0459, -25.0469, 3.7734, 1.0459, -31.2031, -0.4712, 6.3008, -30.1563, -0.4712, 6.3008, -31.2031, 3.7734, 6.3008, -31.2031, 3.7734, 6.3008, -30.1563, -0.4712, 6.3008, -30.1563, 3.7734, 6.3008, -31.2031, 3.7734, 1.0459, -25.0469, 3.7734, 1.0459, -31.2031, 3.7734, 2.0469, -31.2031, 3.7734, 2.0469, -25.0469, 3.7734, 1.0459, -25.0469, 3.7734, 2.0469, -31.2031, 3.7734, 6.3008, -30.1563, 3.7734, 6.3008, -31.2031, 3.7734, 7.4102, -31.2031, 3.7734, 7.4102, -30.1563, 3.7734, 6.3008, -30.1563, 3.7734, 7.4102, -36.9063, -0.4712, -2.6992, -60.4375, -0.4712, -2.6992, -36.9063, 3.8457, -2.6992, -36.9063, 3.8457, -2.6992, -60.4375, -0.4712, -2.6992, -60.4375, 3.8457, -2.6992, -31.2031, -0.4712, 2.0469, -25.0469, -0.4712, 2.0469, -31.2031, -0.4712, 6.3008, -31.2031, -0.4712, 6.3008, -25.0469, -0.4712, 2.0469, -30.1563, -0.4712, 6.3008, -31.2031, -0.4712, -2.6992, -30.1563, -0.4712, -2.6992, -31.2031, -0.4712, 1.0459, -31.2031, -0.4712, 1.0459, -30.1563, -0.4712, -2.6992, -25.0469, -0.4712, 1.0459, -31.2031, -0.4712, -3.5098, -30.1563, -0.4712, -3.5098, -31.2031, 3.8457, -3.5098, -31.2031, 3.8457, -3.5098, -30.1563, -0.4712, -3.5098, -30.1563, 3.8457, -3.5098, -31.2031, 3.8457, -3.5098, -30.1563, 3.8457, -3.5098, -31.2031, 3.8457, -2.6992, -31.2031, 3.8457, -2.6992, -30.1563, 3.8457, -3.5098, -30.1563, 3.8457, -2.6992, -31.2031, 3.666, 11.2734, -30.1563, 3.666, 11.2734, -31.2031, 3.666, 12.0469, -31.2031, 3.666, 12.0469, -30.1563, 3.666, 11.2734, -30.1563, 3.666, 12.0469, -31.2031, -0.4712, 7.4102, -30.1563, -0.4712, 7.4102, -31.2031, -0.4712, 11.2734, -31.2031, -0.4712, 11.2734, -30.1563, -0.4712, 7.4102, -30.1563, -0.4712, 11.2734, -30.1563, -1, -3.5098, -30.1563, -0.4712, -3.5098, -31.2031, -1, -3.5098, -31.2031, -1, -3.5098, -30.1563, -0.4712, -3.5098, -31.2031, -0.4712, -3.5098, -31.2031, -0.4712, 11.2734, -30.1563, -0.4712, 11.2734, -31.2031, 3.666, 11.2734, -31.2031, 3.666, 11.2734, -30.1563, -0.4712, 11.2734, -30.1563, 3.666, 11.2734, -30.1563, -0.4712, 11.2734, -30.1563, -0.4712, 7.4102, -30.1563, 3.666, 11.2734, -30.1563, 3.666, 11.2734, -30.1563, -0.4712, 7.4102, -30.1563, 3.7734, 7.4102, -31.2031, 3.7734, 7.4102, -31.2031, -0.4712, 7.4102, -31.2031, 3.666, 11.2734, -31.2031, 3.666, 11.2734, -31.2031, -0.4712, 7.4102, -31.2031, -0.4712, 11.2734, -31.2031, 3.7734, 7.4102, -31.2031, 3.666, 11.2734, -30.1563, 3.7734, 7.4102, -30.1563, 3.7734, 7.4102, -31.2031, 3.666, 11.2734, -30.1563, 3.666, 11.2734, -60.4375, 3.8457, -2.6992, -60.4375, -0.4712, -2.6992, -60.4375, 3.8457, -3.5098, -60.4375, 3.8457, -3.5098, -60.4375, -0.4712, -2.6992, -60.4375, -0.4712, -3.5098, -50.2813, -0.4712, 7.4102, -50.2813, -0.4712, 6.3008, -55.4375, -0.4712, 7.4102, -55.4375, -0.4712, 7.4102, -50.2813, -0.4712, 6.3008, -55.4375, -0.4712, 6.3008, -60.4063, -0.4712, 1.0459, -36.9063, -0.4712, 1.0459, -60.4063, 3.7734, 1.0459, -60.4063, 3.7734, 1.0459, -36.9063, -0.4712, 1.0459, -36.9063, 3.7734, 1.0459, -50.2813, -0.4712, 6.3008, -36.9063, -0.4712, 6.3008, -50.2813, 3.7734, 6.3008, -50.2813, 3.7734, 6.3008, -36.9063, -0.4712, 6.3008, -36.9063, 3.7734, 6.3008, -60.4063, 3.7734, 1.0459, -36.9063, 3.7734, 1.0459, -60.4063, 3.7734, 2.0469, -60.4063, 3.7734, 2.0469, -36.9063, 3.7734, 1.0459, -36.9063, 3.7734, 2.0469, -50.2813, 3.7734, 6.3008, -36.9063, 3.7734, 6.3008, -50.2813, 3.7734, 7.4102, -50.2813, 3.7734, 7.4102, -36.9063, 3.7734, 6.3008, -36.9063, 3.7734, 7.4102, -60.4375, -0.4712, -2.6992, -36.9063, -0.4712, -2.6992, -60.4063, -0.4712, 1.0459, -60.4063, -0.4712, 1.0459, -36.9063, -0.4712, -2.6992, -36.9063, -0.4712, 1.0459, -60.4375, -0.4712, -3.5098, -36.9063, -0.4712, -3.5098, -60.4375, 3.8457, -3.5098, -60.4375, 3.8457, -3.5098, -36.9063, -0.4712, -3.5098, -36.9063, 3.8457, -3.5098, -60.4375, 3.8457, -3.5098, -36.9063, 3.8457, -3.5098, -60.4375, 3.8457, -2.6992, -60.4375, 3.8457, -2.6992, -36.9063, 3.8457, -3.5098, -36.9063, 3.8457, -2.6992, -39.25, 3.666, 11.2734, -36.9063, 3.666, 11.2734, -39.25, 3.666, 12.0469, -39.25, 3.666, 12.0469, -36.9063, 3.666, 11.2734, -36.9063, 3.666, 12.0469, -36.9063, -1, -3.5098, -36.9063, -0.4712, -3.5098, -44.3125, -1, -3.5098, -44.3125, -1, -3.5098, -36.9063, -0.4712, -3.5098, -60.4375, -0.4712, -3.5098, -39.25, -0.4712, 11.2734, -36.9063, -0.4712, 11.2734, -39.25, 3.666, 11.2734, -39.25, 3.666, 11.2734, -36.9063, -0.4712, 11.2734, -36.9063, 3.666, 11.2734, -64.625, -0.4712, 2.0469, -85.5, -0.4712, 2.0469, -64.625, 3.7734, 2.0469, -64.625, 3.7734, 2.0469, -85.5, -0.4712, 2.0469, -85.5, 3.7734, 2.0469, -64.6875, -0.4712, -2.6992, -85.5, -0.4712, -2.6992, -64.6875, 3.8457, -2.6992, -64.6875, 3.8457, -2.6992, -85.5, -0.4712, -2.6992, -85.5, 3.8457, -2.6992, -43.5, -0.4712, 12.0469, -85.5, -0.4712, 12.0469, -43.5, 3.666, 12.0469, -43.5, 3.666, 12.0469, -85.5, -0.4712, 12.0469, -85.5, 3.666, 12.0469, -64.625, -0.4712, 1.0459, -60.4063, -0.4712, 1.0459, -64.625, 3.7734, 1.0459, -64.625, 3.7734, 1.0459, -60.4063, -0.4712, 1.0459, -60.4063, 3.7734, 1.0459, -64.625, -0.4712, 2.0469, -64.625, 3.7734, 2.0469, -60.4063, -0.4712, 2.0469, -60.4063, -0.4712, 2.0469, -64.625, 3.7734, 2.0469, -60.4063, 3.7734, 2.0469, -64.625, 3.7734, 1.0459, -60.4063, 3.7734, 1.0459, -64.625, 3.7734, 2.0469, -64.625, 3.7734, 2.0469, -60.4063, 3.7734, 1.0459, -60.4063, 3.7734, 2.0469, -64.6875, -0.4712, -2.6992, -60.4375, -0.4712, -2.6992, -64.625, -0.4712, 1.0459, -64.625, -0.4712, 1.0459, -60.4375, -0.4712, -2.6992, -60.4063, -0.4712, 1.0459, -64.6875, -0.4712, -3.5098, -60.4375, -0.4712, -3.5098, -64.6875, -0.4712, -2.6992, -64.6875, -0.4712, -2.6992, -60.4375, -0.4712, -3.5098, -60.4375, -0.4712, -2.6992, -64.6875, -0.4712, -3.5098, -64.6875, -0.4712, -2.6992, -64.6875, 3.8457, -3.5098, -64.6875, 3.8457, -3.5098, -64.6875, -0.4712, -2.6992, -64.6875, 3.8457, -2.6992, -44.3125, -1, -3.5098, -60.4375, -0.4712, -3.5098, -48.5938, -1, -3.5098, -48.5938, -1, -3.5098, -60.4375, -0.4712, -3.5098, -64.6875, -0.4712, -3.5098, -39.25, 3.666, 12.0469, -39.25, -0.4712, 12.0469, -39.25, 3.666, 11.2734, -39.25, 3.666, 11.2734, -39.25, -0.4712, 12.0469, -39.25, -0.4712, 11.2734, -55.4375, -0.4712, 6.3008, -55.4375, 3.7734, 6.3008, -85.625, -0.4712, 6.3008, -85.625, -0.4712, 6.3008, -55.4375, 3.7734, 6.3008, -85.625, 3.7734, 6.3008, -55.4375, -0.4712, 7.4102, -55.4375, -0.4712, 6.3008, -85.625, -0.4712, 7.4102, -85.625, -0.4712, 7.4102, -55.4375, -0.4712, 6.3008, -85.625, -0.4712, 6.3008, -85.5, -0.4712, 12.0469, -85.5, -0.4712, 11.2734, -85.5, 3.666, 12.0469, -85.5, 3.666, 12.0469, -85.5, -0.4712, 11.2734, -85.5, 3.666, 11.2734, -55.4375, 3.7734, 6.3008, -55.4375, 3.7734, 7.4102, -85.625, 3.7734, 6.3008, -85.625, 3.7734, 6.3008, -55.4375, 3.7734, 7.4102, -85.625, 3.7734, 7.4102, -85.625, 3.7734, 7.4102, -85.625, -0.4712, 7.4102, -85.625, 3.7734, 6.3008, -85.625, 3.7734, 6.3008, -85.625, -0.4712, 7.4102, -85.625, -0.4712, 6.3008, -50.2813, -0.4712, 7.4102, -85.5, -0.4712, 7.4102, -50.2813, -0.4712, 6.3008, -50.2813, -0.4712, 6.3008, -85.5, -0.4712, 7.4102, -36.9063, -0.4712, 6.3008, -36.9063, -0.4712, 6.3008, -85.5, -0.4712, 7.4102, -36.9063, -0.4712, 2.0469, -36.9063, -0.4712, 2.0469, -85.5, -0.4712, 7.4102, -60.4063, -0.4712, 2.0469, -60.4063, -0.4712, 2.0469, -85.5, -0.4712, 7.4102, -64.625, -0.4712, 2.0469, -64.625, -0.4712, 2.0469, -85.5, -0.4712, 7.4102, -85.5, -0.4712, 2.0469, -85.5, -0.4712, 2.0469, -85.5, -0.4712, 7.4102, -85.5, -0.4712, 1.0459, -85.5, -0.4712, 1.0459, -85.5, -0.4712, 7.4102, -85.5, -0.4712, -2.6992, -85.5, -0.4712, -2.6992, -85.5, -0.4712, 7.4102, -85.5, -0.4712, -3.5098, -85.5, -0.4712, -3.5098, -85.5, -0.4712, 7.4102, -101.75, -0.4712, -3.5098, -101.75, -0.4712, -3.5098, -85.5, -0.4712, 7.4102, -101.75, -0.4712, 12.0469, -101.75, -0.4712, 12.0469, -85.5, -0.4712, 7.4102, -85.5, -0.4712, 12.0469, -85.5, -0.4712, 12.0469, -85.5, -0.4712, 7.4102, -85.5, -0.4712, 11.2734, -85.5, -0.4712, 12.0469, -85.5, -1, 12.0469, -85.5, -0.4712, 12.9844, -85.5, -0.4712, 12.9844, -85.5, -1, 12.0469, -85.5, -1, 12.9844, -85.5, 3.666, 11.2734, -43.5, 3.666, 11.2734, -85.5, 3.666, 12.0469, -85.5, 3.666, 12.0469, -43.5, 3.666, 11.2734, -43.5, 3.666, 12.0469, -43.5, -0.4712, 11.2734, -43.5, -0.4712, 12.0469, -43.5, 3.666, 11.2734, -43.5, 3.666, 11.2734, -43.5, -0.4712, 12.0469, -43.5, 3.666, 12.0469, -101.75, -1, 12.0469, -101.75, -0.4712, 12.0469, -101.75, -1, 12.9844, -101.75, -1, 12.9844, -101.75, -0.4712, 12.0469, -101.75, -0.4712, 12.9844, -39.25, -0.4712, 11.2734, -39.25, -0.4712, 12.0469, -43.5, -0.4712, 11.2734, -43.5, -0.4712, 11.2734, -39.25, -0.4712, 12.0469, -43.5, -0.4712, 12.0469, -55.4375, 3.7734, 7.4102, -55.4375, -0.4712, 7.4102, -85.625, 3.7734, 7.4102, -85.625, 3.7734, 7.4102, -55.4375, -0.4712, 7.4102, -85.625, -0.4712, 7.4102, -85.5, -0.4712, 11.2734, -85.5, -0.4712, 7.4102, -43.5, -0.4712, 11.2734, -43.5, -0.4712, 11.2734, -85.5, -0.4712, 7.4102, -39.25, -0.4712, 11.2734, -39.25, -0.4712, 11.2734, -85.5, -0.4712, 7.4102, -36.9063, -0.4712, 11.2734, -36.9063, -0.4712, 11.2734, -85.5, -0.4712, 7.4102, -36.9063, -0.4712, 7.4102, -101.75, -0.4712, 12.0469, -85.5, -0.4712, 12.0469, -101.75, 9.8203, 12.0469, -101.75, 9.8203, 12.0469, -85.5, -0.4712, 12.0469, -85.5, 13.7734, 12.0469, -101.75, -1, -3.5098, -85.5, -1, -3.5098, -101.75, -1, -4.125, -101.75, -1, -4.125, -85.5, -1, -3.5098, -85.5, -1, -4.125, -85.5, -0.4712, 12.9844, -85.5, -1, 12.9844, -101.75, -0.4712, 12.9844, -101.75, -0.4712, 12.9844, -85.5, -1, 12.9844, -101.75, -1, 12.9844, -85.5, -1, 12.0469, -101.75, -1, 12.0469, -85.5, -1, 12.9844, -85.5, -1, 12.9844, -101.75, -1, 12.0469, -101.75, -1, 12.9844, -55.4375, 3.7734, 6.3008, -55.4375, -0.4712, 6.3008, -55.4375, 3.7734, 7.4102, -55.4375, 3.7734, 7.4102, -55.4375, -0.4712, 6.3008, -55.4375, -0.4712, 7.4102, -50.2813, -0.4712, 7.4102, -50.2813, 3.7734, 7.4102, -50.2813, -0.4712, 6.3008, -50.2813, -0.4712, 6.3008, -50.2813, 3.7734, 7.4102, -50.2813, 3.7734, 6.3008, -102.438, -0.4712, -3.5098, -102.438, -0.4712, 12.0469, -102.438, -1, -3.5098, -102.438, -1, -3.5098, -102.438, -0.4712, 12.0469, -102.438, -1, 12.0469, -101.75, -0.4712, 12.0469, -102.438, -0.4712, 12.0469, -101.75, 9.8125, 12.0469, -101.75, 9.8125, 12.0469, -102.438, -0.4712, 12.0469, -102.438, 10.0391, 12.0469, -101.75, -1, 12.0469, -101.75, -1, -3.5098, -102.438, -1, 12.0469, -102.438, -1, 12.0469, -101.75, -1, -3.5098, -102.438, -1, -3.5098, -101.75, -0.4712, 12.0469, -101.75, -1, 12.0469, -102.438, -0.4712, 12.0469, -102.438, -0.4712, 12.0469, -101.75, -1, 12.0469, -102.438, -1, 12.0469, -85.5, -1, -4.125, -85.5, -0.4712, -4.125, -101.75, -1, -4.125, -101.75, -1, -4.125, -85.5, -0.4712, -4.125, -101.75, -0.4712, -4.125, -101.75, -0.4712, -3.5098, -101.75, -1, -3.5098, -101.75, -0.4712, -4.125, -101.75, -0.4712, -4.125, -101.75, -1, -3.5098, -101.75, -1, -4.125, -85.5, -1, -3.5098, -85.5, -0.4712, -3.5098, -85.5, -1, -4.125, -85.5, -1, -4.125, -85.5, -0.4712, -3.5098, -85.5, -0.4712, -4.125, -85.5, -0.4712, -4.125, -85.5, -0.4712, -3.5098, -85.5, 13.3203, -4.125, -85.5, 13.3203, -4.125, -85.5, -0.4712, -3.5098, -85.5, 13.3203, -3.5098, -85.5, 13.3203, -3.5098, -101.75, 10.2344, -3.5098, -85.5, 13.3203, -4.125, -85.5, 13.3203, -4.125, -101.75, 10.2344, -3.5098, -101.75, 10.2344, -4.125, -85.5, -0.4712, -3.5098, -101.75, -0.4712, -3.5098, -85.5, 13.3203, -3.5098, -85.5, 13.3203, -3.5098, -101.75, -0.4712, -3.5098, -101.75, 10.2344, -3.5098, -101.75, -0.4712, -4.125, -85.5, -0.4712, -4.125, -101.75, 10.2344, -4.125, -101.75, 10.2344, -4.125, -85.5, -0.4712, -4.125, -85.5, 13.3203, -4.125, -101.75, -0.4712, -3.5098, -101.75, -0.4712, -4.125, -101.75, 10.2344, -3.5098, -101.75, 10.2344, -3.5098, -101.75, -0.4712, -4.125, -101.75, 10.2344, -4.125, -101.75, 10.2188, -3.5098, -101.75, 9.8125, 12.0469, -102.438, 10.0391, -3.5098, -102.438, 10.0391, -3.5098, -101.75, 9.8125, 12.0469, -102.438, 10.0391, 12.0469, -101.75, -0.4712, -3.5098, -101.75, -0.4712, 12.0469, -101.75, 10.2188, -3.5098, -101.75, 10.2188, -3.5098, -101.75, -0.4712, 12.0469, -101.75, 9.8125, 12.0469, -102.438, -0.4712, -3.5098, -101.75, -0.4712, -3.5098, -102.438, 10.0391, -3.5098, -102.438, 10.0391, -3.5098, -101.75, -0.4712, -3.5098, -101.75, 10.2188, -3.5098, -102.438, -0.4712, 12.0469, -102.438, -0.4712, -3.5098, -102.438, 10.0391, 12.0469, -102.438, 10.0391, 12.0469, -102.438, -0.4712, -3.5098, -102.438, 10.0391, -3.5098, -101.75, 9.8203, 12.0469, -85.5, 13.7734, 12.0469, -101.75, 9.8203, 12.9844, -101.75, 9.8203, 12.9844, -85.5, 13.7734, 12.0469, -85.5, 13.7734, 12.9844, -85.5, -0.4712, 12.0469, -85.5, -0.4712, 12.9844, -85.5, 13.7734, 12.0469, -85.5, 13.7734, 12.0469, -85.5, -0.4712, 12.9844, -85.5, 13.7734, 12.9844, -85.5, -0.4712, 12.9844, -101.75, -0.4712, 12.9844, -85.5, 13.7734, 12.9844, -85.5, 13.7734, 12.9844, -101.75, -0.4712, 12.9844, -101.75, 9.8203, 12.9844, -101.75, -0.4712, 12.9844, -101.75, -0.4712, 12.0469, -101.75, 9.8203, 12.9844, -101.75, 9.8203, 12.9844, -101.75, -0.4712, 12.0469, -101.75, 9.8203, 12.0469, -101.75, 9.8203, 12.0469, -85.5, 13.7734, 12.0469, -101.938, 10.6406, 12.0469, -101.938, 10.6406, 12.0469, -85.5, 13.7734, 12.0469, -85.6875, 14.5938, 12.0469, -101.938, 10.6406, 12.0469, -85.6875, 14.5938, 12.0469, -101.938, 10.6328, 12.0469, -101.938, 10.6328, 12.0469, -85.6875, 14.5938, 12.0469, -101.938, 11.0391, -3.5117, -101.938, 11.0391, -3.5117, -85.6875, 14.5938, 12.0469, -101.938, 11.0547, -3.5117, -101.938, 11.0547, -3.5117, -85.6875, 14.5938, 12.0469, -85.6875, 14.1406, -3.5117, -85.5, 13.7734, 12.0469, -85.5, 13.3203, -3.5098, -85.6875, 14.5938, 12.0469, -85.6875, 14.5938, 12.0469, -85.5, 13.3203, -3.5098, -85.6875, 14.1406, -3.5117, -85.5, 13.3203, -3.5098, -101.75, 10.2344, -3.5098, -85.6875, 14.1406, -3.5117, -85.6875, 14.1406, -3.5117, -101.75, 10.2344, -3.5098, -101.938, 11.0547, -3.5117, -101.75, 9.8125, 12.0469, -101.75, 9.8203, 12.0469, -101.938, 10.6328, 12.0469, -101.938, 10.6328, 12.0469, -101.75, 9.8203, 12.0469, -101.938, 10.6406, 12.0469, -101.75, 10.2344, -3.5098, -101.75, 10.2188, -3.5098, -101.938, 11.0547, -3.5117, -101.938, 11.0547, -3.5117, -101.75, 10.2188, -3.5098, -101.938, 11.0391, -3.5117, -101.75, 10.2188, -3.5098, -101.75, 9.8125, 12.0469, -101.938, 11.0391, -3.5117, -101.938, 11.0391, -3.5117, -101.75, 9.8125, 12.0469, -101.938, 10.6328, 12.0469, -85.5, 13.3203, -3.5098, -85.5, 13.7734, 12.0469, -101.75, 10.2344, -3.5098, -101.75, 10.2344, -3.5098, -85.5, 13.7734, 12.0469, -101.75, 10.2188, -3.5098, -101.75, 10.2188, -3.5098, -85.5, 13.7734, 12.0469, -101.75, 9.8125, 12.0469, -101.75, 9.8125, 12.0469, -85.5, 13.7734, 12.0469, -101.75, 9.8203, 12.0469 ) -[sub_resource type="SphereShape" id=4] +[sub_resource type="SphereShape" id=2] radius = 1.0 -[sub_resource type="SphereMesh" id=5] +[sub_resource type="SphereMesh" id=3] radius = 1.0 height = 2.0 @@ -19,11 +19,11 @@ radial_segments = 64 rings = 32 is_hemisphere = false -[sub_resource type="BoxShape" id=2] +[sub_resource type="BoxShape" id=4] extents = Vector3( 7, 0.25, 7 ) -[sub_resource type="CubeMesh" id=3] +[sub_resource type="CubeMesh" id=5] size = Vector3( 14, 0.5, 14 ) subdivide_width = 0 @@ -35,6 +35,18 @@ subdivide_depth = 0 radius = 0.5 height = 14.0 +[sub_resource type="DynamicFontData" id=7] + +font_path = "res://assets/DejaVuSansMono.ttf" + +[sub_resource type="DynamicFont" id=8] + +size = 16 +use_mipmaps = false +use_filter = false +font_data = SubResource( 7 ) +_sections_unfolded = [ "Font", "Resource" ] + [node name="world" type="Spatial" index="0"] [node name="DirectionalLight" type="DirectionalLight" parent="." index="0"] @@ -197,7 +209,7 @@ _sections_unfolded = [ "Collision", "Pause", "Transform", "Visibility" ] [node name="CollisionShape" type="CollisionShape" parent="Ball" index="0"] -shape = SubResource( 4 ) +shape = SubResource( 2 ) disabled = false _sections_unfolded = [ "Transform", "Visibility" ] @@ -212,7 +224,7 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 5 ) +mesh = SubResource( 3 ) skeleton = NodePath("..") material/0 = null _sections_unfolded = [ "Geometry", "Transform", "material" ] @@ -253,7 +265,7 @@ _sections_unfolded = [ "Axis Lock", "Collision", "Linear", "Transform", "Visibil [node name="CollisionShape" type="CollisionShape" parent="FullObjective/Objective" index="0"] -shape = SubResource( 2 ) +shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] @@ -269,7 +281,7 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 3 ) +mesh = SubResource( 5 ) skeleton = NodePath("..") material/0 = null _sections_unfolded = [ "Transform" ] @@ -312,4 +324,26 @@ shape = SubResource( 6 ) disabled = false _sections_unfolded = [ "Transform", "Visibility" ] +[node name="Debug" type="Label" parent="." index="9"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 831.0 +margin_top = 27.0 +margin_right = 1004.0 +margin_bottom = 94.0 +grow_horizontal = 0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 4 +custom_fonts/font = SubResource( 8 ) +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 +_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Material", "Mouse", "Pause", "Rect", "Size Flags", "Theme", "Visibility", "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ] + diff --git a/scripts/heroes/0.gd b/scripts/heroes/0.gd index 0c6b078..793bc39 100644 --- a/scripts/heroes/0.gd +++ b/scripts/heroes/0.gd @@ -1,7 +1,13 @@ extends "res://scripts/player.gd" -const wallride_speed = 0.5 +const wallride_speed = 0 const wallride_speed_necessary = 15 +const wallride_leap_height = 10 +const wallride_leap_side = 10 + +var since_on_wall = 0 +var last_wall_normal = Vector3() +var wallride_forgiveness = .150 func control_player(delta): wallride(delta) @@ -9,15 +15,16 @@ func control_player(delta): func wallride(delta): # If our feet aren't touching, but we are colliding, we are wall-riding - if is_on_wall() and velocity.length() > wallride_speed_necessary: + if is_on_wall() and not is_on_floor() and velocity.length() > wallride_speed_necessary: + since_on_wall = 0 + last_wall_normal = get_slide_collision(0).normal + else: + since_on_wall += delta + if since_on_wall < wallride_forgiveness: var aim = get_node("Yaw").get_global_transform().basis - var direction = Vector3() - if Input.is_action_pressed("move_forwards"): - direction -= aim[2] - if Input.is_action_pressed("move_backwards"): - direction += aim[2] - velocity += direction * wallride_speed + # Add zero gravity velocity.y = -gravity # So it's undone in super - else: - pass - # We need to return to falling (we aren't riding anymore) + # Allow jumping (for wall hopping!) + if Input.is_action_just_pressed("jump"): + velocity.y += wallride_leap_height + velocity += wallride_leap_side * last_wall_normal diff --git a/scripts/player.gd b/scripts/player.gd index fdd2611..d54c89d 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -8,9 +8,7 @@ var view_sensitivity = 0.25 var yaw = 0 var pitch = 0 -const air_accel = 0.02 - -var gravity = -1 +var gravity = -.8 var velocity = Vector3() slave var slave_tf = Basis() slave var slave_vel = Vector3() @@ -20,12 +18,15 @@ var timer = 0 # Walking speed and jumping height are defined later. var walk_speed = 3 var jump_speed = 15 +const air_accel = .5 var weight = 1 var health = 100 var stamina = 10000 var ray_length = 10 +var debug_node + func _ready(): set_process_input(true) @@ -33,21 +34,20 @@ func _ready(): # Capture mouse once game is started: Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - #set_physics_process(true) - get_node("Crosshair").set_text("+") - + debug_node = get_node("/root/world/Debug") + if is_network_master(): get_node("Yaw/Camera").make_current() func _input(event): if is_network_master(): - + if event is InputEventMouseMotion: yaw = fmod(yaw - event.relative.x * view_sensitivity, 360) pitch = max(min(pitch - event.relative.y * view_sensitivity, 85), -85) get_node("Yaw").set_rotation(Vector3(0, deg2rad(yaw), 0)) get_node("Yaw/Camera").set_rotation(Vector3(deg2rad(pitch), 0, 0)) - + # Toggle mouse capture: if Input.is_action_pressed("toggle_mouse_capture"): if (Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED): @@ -56,7 +56,7 @@ func _input(event): else: Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) view_sensitivity = 0.25 - + # Quit the game: if Input.is_action_pressed("quit"): quit() @@ -87,8 +87,7 @@ func control_player(delta): direction += aim[0] direction = direction.normalized() - var ray = get_node("Ray") - + var friction if is_on_floor(): @@ -108,13 +107,15 @@ func control_player(delta): velocity.z *= friction velocity.y += gravity velocity += direction * air_accel - + # Just for testing TODO if Input.is_action_pressed("jump"): velocity.y += jump_speed * 0.1 - move_and_slide(velocity, Vector3(0, 1, 0)) - + debug_node.set_text("%8.f,%8.f,%8.f" % [velocity.x, velocity.y, velocity.z]) + + velocity = move_and_slide(velocity, Vector3(0, 1, 0)) + for i in range(get_slide_count()): var collision = get_slide_collision(i) if collision.collider.is_in_group("objective"):