diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-02-19 11:57:14 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-19 11:57:14 -0300 |
commit | d7d65fa2f2b51d03f7bdfcbceedca99188ce979c (patch) | |
tree | fecdf1bfa39ba5a4895b4dbf340a3b68098c109a /demos/2d/platformer | |
parent | 8c1731b67995add31361ae526b0e6af76346181e (diff) |
-improved physics ccd
-html5 exporter works again
-disable repeat on image loader by default
-can change shape offset en tileset, texture offset was broken
Diffstat (limited to 'demos/2d/platformer')
-rw-r--r-- | demos/2d/platformer/bullet.gd | 1 | ||||
-rw-r--r-- | demos/2d/platformer/bullet.xml | 189 | ||||
-rw-r--r-- | demos/2d/platformer/enemy.gd | 1 | ||||
-rw-r--r-- | demos/2d/platformer/moving_platform.xml | 24 | ||||
-rw-r--r-- | demos/2d/platformer/player.xml | 91 | ||||
-rw-r--r-- | demos/2d/platformer/stage.xml | 61 | ||||
-rw-r--r-- | demos/2d/platformer/tileset_edit.xml | 235 |
7 files changed, 366 insertions, 236 deletions
diff --git a/demos/2d/platformer/bullet.gd b/demos/2d/platformer/bullet.gd index 6836116aa4..9aacc9809d 100644 --- a/demos/2d/platformer/bullet.gd +++ b/demos/2d/platformer/bullet.gd @@ -15,6 +15,7 @@ func disable(): func _ready(): # Initalization here + get_node("Timer").start() pass diff --git a/demos/2d/platformer/bullet.xml b/demos/2d/platformer/bullet.xml index 9de518c703..84c903803f 100644 --- a/demos/2d/platformer/bullet.xml +++ b/demos/2d/platformer/bullet.xml @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> -<resource_file type="PackedScene" subresource_count="5" version="0.99" version_name="Godot Engine v0.99.3037-pre-beta"> - <ext_resource path="res://bullet.png" type="Texture"></ext_resource> - <ext_resource path="res://bullet.gd" type="GDScript"></ext_resource> - <resource type="CircleShape2D" path="local://0"> - <string name="resource/name"> "" </string> +<resource_file type="PackedScene" subresource_count="5" version="1.0" version_name="Godot Engine v1.0.3917-beta1"> + <ext_resource path="res://bullet.*" type="Texture"></ext_resource> + <ext_resource path="res://bullet.*" type="Script"></ext_resource> + <resource type="CircleShape2D" path="local://1"> <real name="custom_solver_bias"> 0 </real> <real name="radius"> 10 </real> - <resource name="script/script"></resource> + </resource> - <resource type="Animation" path="local://1"> + <resource type="Animation" path="local://2"> <string name="resource/name"> "shutdown" </string> <real name="length"> 1.5 </real> <bool name="loop"> False </bool> @@ -16,13 +15,13 @@ <string name="tracks/0/type"> "value" </string> <node_path name="tracks/0/path"> "particles:config/emitting" </node_path> <int name="tracks/0/interp"> 1 </int> - <dictionary name="tracks/0/keys"> + <dictionary name="tracks/0/keys" shared="false"> <string> "cont" </string> <bool> False </bool> <string> "transitions" </string> <real_array len="1"> 1 </real_array> <string> "values" </string> - <array len="1"> + <array len="1" shared="false"> <bool> False </bool> </array> <string> "times" </string> @@ -31,13 +30,13 @@ <string name="tracks/1/type"> "value" </string> <node_path name="tracks/1/path"> "sprite:visibility/self_opacity" </node_path> <int name="tracks/1/interp"> 1 </int> - <dictionary name="tracks/1/keys"> + <dictionary name="tracks/1/keys" shared="false"> <string> "cont" </string> <bool> True </bool> <string> "transitions" </string> <real_array len="2"> 1, 1 </real_array> <string> "values" </string> - <array len="2"> + <array len="2" shared="false"> <real> 1 </real> <real> 0 </real> </array> @@ -47,14 +46,14 @@ <string name="tracks/2/type"> "method" </string> <node_path name="tracks/2/path"> "." </node_path> <int name="tracks/2/interp"> 1 </int> - <dictionary name="tracks/2/keys"> + <dictionary name="tracks/2/keys" shared="false"> <string> "transitions" </string> <real_array len="1"> 1 </real_array> <string> "values" </string> - <array len="1"> - <dictionary> + <array len="1" shared="false"> + <dictionary shared="false"> <string> "args" </string> - <array len="0"> + <array len="0" shared="false"> </array> <string> "method" </string> <string> "queue_free" </string> @@ -63,33 +62,25 @@ <string> "times" </string> <real_array len="1"> 1.31 </real_array> </dictionary> - <resource name="script/script"></resource> + </resource> <main_resource> - <string name="resource/name"> "" </string> - <dictionary name="_bundled"> + <dictionary name="_bundled" shared="false"> <string> "names" </string> - <string_array len="109"> + <string_array len="111"> <string> "bullet" </string> <string> "RigidBody2D" </string> - <string> "process/process" </string> - <string> "process/fixed_process" </string> - <string> "process/input" </string> - <string> "process/unhandled_input" </string> - <string> "process/mode" </string> <string> "visibility/visible" </string> - <string> "visibility/toplevel" </string> <string> "visibility/opacity" </string> <string> "visibility/self_opacity" </string> <string> "visibility/on_top" </string> - <string> "visibility/blend_mode" </string> - <string> "transform/notify" </string> <string> "transform/pos" </string> <string> "transform/rot" </string> <string> "transform/scale" </string> <string> "shape_count" </string> <string> "shapes/0/shape" </string> <string> "shapes/0/transform" </string> + <string> "shapes/0/trigger" </string> <string> "mode" </string> <string> "mass" </string> <string> "friction" </string> @@ -106,8 +97,10 @@ <string> "__meta__" </string> <string> "particles" </string> <string> "Particles2D" </string> + <string> "visibility/blend_mode" </string> <string> "config/amount" </string> <string> "config/lifetime" </string> + <string> "config/time_scale" </string> <string> "config/preprocess" </string> <string> "config/emit_timeout" </string> <string> "config/emitting" </string> @@ -115,11 +108,14 @@ <string> "config/half_extents" </string> <string> "config/local_space" </string> <string> "config/explosiveness" </string> + <string> "config/flip_h" </string> + <string> "config/flip_v" </string> <string> "config/texture" </string> <string> "params/direction" </string> <string> "params/spread" </string> <string> "params/linear_velocity" </string> <string> "params/spin_velocity" </string> + <string> "params/orbit_velocity" </string> <string> "params/gravity_direction" </string> <string> "params/gravity_strength" </string> <string> "params/radial_accel" </string> @@ -132,6 +128,7 @@ <string> "randomness/spread" </string> <string> "randomness/linear_velocity" </string> <string> "randomness/spin_velocity" </string> + <string> "randomness/orbit_velocity" </string> <string> "randomness/gravity_direction" </string> <string> "randomness/gravity_strength" </string> <string> "randomness/radial_accel" </string> @@ -149,6 +146,7 @@ <string> "phase_2/color" </string> <string> "phase_3/pos" </string> <string> "phase_3/color" </string> + <string> "emission_points" </string> <string> "sprite" </string> <string> "Sprite" </string> <string> "texture" </string> @@ -164,6 +162,7 @@ <string> "region_rect" </string> <string> "CollisionShape2D" </string> <string> "shape" </string> + <string> "trigger" </string> <string> "Timer" </string> <string> "wait_time" </string> <string> "one_shot" </string> @@ -173,8 +172,9 @@ <string> "playback/process_mode" </string> <string> "playback/default_blend_time" </string> <string> "root/root" </string> - <string> "speed" </string> <string> "anims/shutdown" </string> + <string> "playback/active" </string> + <string> "playback/speed" </string> <string> "blend_times" </string> <string> "autoplay" </string> <string> "disable" </string> @@ -187,99 +187,150 @@ <string> "node_count" </string> <int> 6 </int> <string> "variants" </string> - <array len="27"> - <bool> False </bool> - <int> 0 </int> + <array len="27" shared="false"> <bool> True </bool> <real> 1 </real> <vector2> 0, 0 </vector2> <real> 0 </real> <vector2> 1, 1 </vector2> <int> 1 </int> - <resource resource_type="CircleShape2D" path="local://0"> </resource> + <resource resource_type="Shape2D" path="local://1"> </resource> <matrix32> 1, 0, 0, 1, 0, 0 </matrix32> - <resource resource_type="GDScript" path="res://bullet.gd"> </resource> - <dictionary> + <bool> False </bool> + <int> 0 </int> + <int> 2 </int> + <resource resource_type="Script" path="res://bullet.*"> </resource> + <dictionary shared="false"> <string> "__editor_plugin_states__" </string> - <dictionary> + <dictionary shared="false"> <string> "Script" </string> - <dictionary> + <dictionary shared="false"> <string> "current" </string> - <int> 0 </int> + <int> 2 </int> <string> "sources" </string> - <array len="3"> + <array len="3" shared="false"> <string> "res://enemy.gd" </string> <string> "res://player.gd" </string> <string> "res://bullet.gd" </string> </array> </dictionary> <string> "2D" </string> - <dictionary> + <dictionary shared="false"> + <string> "pixel_snap" </string> + <bool> False </bool> <string> "zoom" </string> <real> 3.424785 </real> <string> "ofs" </string> <vector2> -74.7573, -35.9676 </vector2> </dictionary> <string> "3D" </string> - <dictionary> + <dictionary shared="false"> <string> "zfar" </string> <real> 500 </real> <string> "fov" </string> <real> 45 </real> - <string> "window_mode" </string> - <int> 0 </int> - <string> "window_0" </string> - <dictionary> - <string> "distance" </string> - <real> 10.07268 </real> - <string> "default_light" </string> - <bool> True </bool> - <string> "x_rot" </string> - <real> 0.337 </real> - <string> "y_rot" </string> - <real> -0.575 </real> - <string> "show_grid" </string> - <bool> True </bool> - <string> "show_origin" </string> - <bool> True </bool> - <string> "pos" </string> - <vector3> 0, 0, 0 </vector3> - </dictionary> + <string> "viewports" </string> + <array len="4" shared="false"> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + </array> + <string> "viewport_mode" </string> + <int> 1 </int> + <string> "default_light" </string> + <bool> True </bool> + <string> "show_grid" </string> + <bool> True </bool> + <string> "show_origin" </string> + <bool> True </bool> <string> "znear" </string> <real> 0.1 </real> </dictionary> </dictionary> <string> "__editor_run_settings__" </string> - <dictionary> + <dictionary shared="false"> <string> "custom_args" </string> <string> "-l $scene" </string> <string> "run_mode" </string> <int> 0 </int> </dictionary> <string> "__editor_plugin_screen__" </string> - <string> "Script" </string> + <string> "2D" </string> </dictionary> <real> 0.559322 </real> <int> 24 </int> <real> 0.1 </real> - <resource resource_type="Texture" path="res://bullet.png"> </resource> + <resource resource_type="Texture" path="res://bullet.*"> </resource> <real> 10 </real> - <int> 2 </int> <color> 1, 1, 1, 1 </color> <color> 1, 0, 0, 0 </color> <color> 0, 0, 0, 1 </color> - <resource name=""></resource> <rect2> 0, 0, 0, 0 </rect2> + <vector2_array len="0"> </vector2_array> + <rect2> 0, 0, 0, 0 </rect2> <node_path> ".." </node_path> - <resource resource_type="Animation" path="local://1"> </resource> - <array len="0"> + <resource resource_type="Animation" path="local://2"> </resource> + <array len="0" shared="false"> </array> <string> "" </string> </array> <string> "nodes" </string> - <int_array len="356"> -1, -1, 1, 0, -1, 32, 2, 0, 3, 0, 4, 0, 5, 0, 6, 1, 7, 2, 8, 0, 9, 3, 10, 3, 11, 2, 12, 1, 13, 2, 14, 4, 15, 5, 16, 6, 17, 7, 18, 8, 19, 9, 20, 1, 21, 3, 22, 3, 23, 5, 24, 0, 25, 0, 26, 1, 27, 0, 28, 2, 29, 2, 30, 4, 31, 5, 32, 10, 33, 11, 0, 0, 0, 35, 34, -1, 59, 2, 2, 3, 0, 4, 0, 5, 0, 6, 1, 7, 2, 8, 0, 9, 12, 10, 3, 11, 2, 12, 7, 13, 0, 14, 4, 15, 5, 16, 6, 36, 13, 37, 14, 38, 5, 39, 5, 40, 2, 41, 4, 42, 4, 43, 0, 44, 3, 45, 15, 46, 5, 47, 16, 48, 5, 49, 5, 50, 5, 51, 5, 52, 5, 53, 5, 54, 5, 55, 3, 56, 5, 57, 5, 58, 5, 59, 5, 60, 5, 61, 5, 62, 5, 63, 5, 64, 5, 65, 5, 66, 5, 67, 5, 68, 5, 69, 5, 70, 17, 71, 5, 72, 18, 73, 3, 74, 19, 75, 3, 76, 20, 77, 3, 78, 20, 32, 21, 0, 0, 0, 80, 79, -1, 27, 2, 0, 3, 0, 4, 0, 5, 0, 6, 1, 7, 2, 8, 0, 9, 3, 10, 3, 11, 2, 12, 1, 13, 0, 14, 4, 15, 5, 16, 6, 81, 15, 82, 2, 83, 4, 84, 0, 85, 0, 86, 7, 87, 7, 88, 1, 89, 18, 90, 0, 91, 22, 32, 21, 0, 0, 0, 92, 92, -1, 17, 2, 0, 3, 0, 4, 0, 5, 0, 6, 1, 7, 2, 8, 0, 9, 3, 10, 3, 11, 2, 12, 1, 13, 2, 14, 4, 15, 5, 16, 6, 93, 8, 32, 21, 0, 0, 0, 94, 94, -1, 9, 2, 0, 3, 0, 4, 0, 5, 0, 6, 1, 95, 3, 96, 2, 97, 2, 32, 21, 0, 0, 0, 99, 98, -1, 13, 2, 0, 3, 0, 4, 0, 5, 0, 6, 1, 100, 7, 101, 5, 102, 23, 103, 3, 104, 24, 105, 25, 106, 26, 32, 21, 0 </int_array> + <int_array len="282"> -1, -1, 1, 0, -1, 25, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 11, 7, 12, 8, 13, 9, 14, 1, 15, 1, 16, 3, 17, 8, 18, 10, 19, 9, 20, 8, 21, 0, 22, 0, 23, 2, 24, 3, 25, 11, 26, 12, 0, 0, 0, 28, 27, -1, 57, 2, 0, 3, 13, 4, 1, 5, 0, 29, 5, 6, 2, 7, 3, 8, 4, 30, 14, 31, 15, 32, 1, 33, 3, 34, 3, 35, 0, 36, 2, 37, 2, 38, 8, 39, 1, 40, 8, 41, 8, 42, 16, 43, 3, 44, 17, 45, 3, 46, 3, 47, 3, 48, 3, 49, 3, 50, 3, 51, 3, 52, 3, 53, 1, 54, 3, 55, 3, 56, 3, 57, 3, 58, 3, 59, 3, 60, 3, 61, 3, 62, 3, 63, 3, 64, 3, 65, 3, 66, 3, 67, 3, 68, 3, 69, 10, 70, 3, 71, 18, 72, 1, 73, 19, 74, 1, 75, 20, 76, 1, 77, 20, 78, 21, 0, 0, 0, 80, 79, -1, 18, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 81, 16, 82, 0, 83, 2, 84, 8, 85, 8, 86, 5, 87, 5, 88, 9, 89, 18, 90, 8, 91, 22, 0, 0, 0, 92, 92, -1, 9, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 93, 6, 94, 8, 0, 0, 0, 95, 95, -1, 3, 96, 1, 97, 0, 98, 8, 0, 0, 0, 100, 99, -1, 8, 101, 5, 102, 3, 103, 23, 104, 24, 105, 0, 106, 1, 107, 25, 108, 26, 0 </int_array> <string> "conns" </string> - <int_array len="6"> 4, 0, 108, 107, 2, 0 </int_array> + <int_array len="6"> 4, 0, 110, 109, 2, 0 </int_array> </dictionary> - <resource name="script/script"></resource> + </main_resource> </resource_file>
\ No newline at end of file diff --git a/demos/2d/platformer/enemy.gd b/demos/2d/platformer/enemy.gd index 5ec7cb28a7..b4e70477a8 100644 --- a/demos/2d/platformer/enemy.gd +++ b/demos/2d/platformer/enemy.gd @@ -95,3 +95,4 @@ func _ready(): rc_right=get_node("raycast_right") + diff --git a/demos/2d/platformer/moving_platform.xml b/demos/2d/platformer/moving_platform.xml index 8f4e4c7741..4d54d6d11c 100644 --- a/demos/2d/platformer/moving_platform.xml +++ b/demos/2d/platformer/moving_platform.xml @@ -10,7 +10,7 @@ <main_resource> <dictionary name="_bundled" shared="false"> <string> "names" </string> - <string_array len="39"> + <string_array len="46"> <string> "moving_platform" </string> <string> "Node2D" </string> <string> "visibility/visible" </string> @@ -25,16 +25,23 @@ <string> "motion" </string> <string> "cycle" </string> <string> "platform" </string> - <string> "StaticBody2D" </string> + <string> "RigidBody2D" </string> <string> "shape_count" </string> <string> "shapes/0/shape" </string> <string> "shapes/0/transform" </string> <string> "shapes/0/trigger" </string> - <string> "simulate_motion" </string> - <string> "constant_linear_velocity" </string> - <string> "constant_angular_velocity" </string> + <string> "mode" </string> + <string> "mass" </string> <string> "friction" </string> <string> "bounce" </string> + <string> "custom_integrator" </string> + <string> "continuous_cd" </string> + <string> "contacts_reported" </string> + <string> "contact_monitor" </string> + <string> "active" </string> + <string> "can_sleep" </string> + <string> "velocity/linear" </string> + <string> "velocity/angular" </string> <string> "Sprite" </string> <string> "texture" </string> <string> "centered" </string> @@ -58,7 +65,7 @@ <string> "node_count" </string> <int> 4 </int> <string> "variants" </string> - <array len="16" shared="false"> + <array len="17" shared="false"> <bool> True </bool> <real> 1 </real> <vector2> 0, 0 </vector2> @@ -180,14 +187,15 @@ <resource resource_type="Shape2D" path="local://1"> </resource> <matrix32> 1, -0, 0, 1, 0, 0 </matrix32> <bool> False </bool> - <resource resource_type="Texture" path="res://moving_platform.*"> </resource> + <int> 3 </int> <int> 0 </int> + <resource resource_type="Texture" path="res://moving_platform.*"> </resource> <color> 1, 1, 1, 1 </color> <rect2> 0, 0, 0, 0 </rect2> <vector2_array len="4"> -88, -24, 88, -24, 88, 24, -88, 24 </vector2_array> </array> <string> "nodes" </string> - <int_array len="136"> -1, -1, 1, 0, -1, 11, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 11, 2, 12, 1, 0, 0, 0, 14, 13, -1, 16, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 15, 7, 16, 8, 17, 9, 18, 10, 19, 0, 20, 2, 21, 3, 22, 1, 23, 3, 0, 1, 0, 24, 24, -1, 18, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 25, 11, 26, 0, 27, 2, 28, 10, 29, 10, 30, 7, 31, 7, 32, 12, 33, 13, 34, 10, 35, 14, 0, 1, 0, 36, 36, -1, 9, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 37, 12, 38, 15, 0 </int_array> + <int_array len="150"> -1, -1, 1, 0, -1, 11, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 11, 2, 12, 1, 0, 0, 0, 14, 13, -1, 23, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 15, 7, 16, 8, 17, 9, 18, 10, 19, 11, 20, 1, 21, 1, 22, 3, 23, 10, 24, 10, 25, 12, 26, 10, 27, 0, 28, 0, 29, 2, 30, 3, 0, 1, 0, 31, 31, -1, 18, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 32, 13, 33, 0, 34, 2, 35, 10, 36, 10, 37, 7, 38, 7, 39, 12, 40, 14, 41, 10, 42, 15, 0, 1, 0, 43, 43, -1, 9, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 44, 12, 45, 16, 0 </int_array> <string> "conns" </string> <int_array len="0"> </int_array> </dictionary> diff --git a/demos/2d/platformer/player.xml b/demos/2d/platformer/player.xml index 94086a8b19..404032d352 100644 --- a/demos/2d/platformer/player.xml +++ b/demos/2d/platformer/player.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> <resource_file type="PackedScene" subresource_count="24" version="1.0" version_name="Godot Engine v1.0.3917-beta1"> <ext_resource path="res://robot_demo.*" type="Texture"></ext_resource> + <ext_resource path="res://osb_jump.*" type="Texture"></ext_resource> <ext_resource path="res://player.*" type="Script"></ext_resource> - <ext_resource path="res://sound_shoot.*" type="Sample"></ext_resource> - <ext_resource path="res://sound_coin.*" type="Sample"></ext_resource> <ext_resource path="res://osb_right.*" type="Texture"></ext_resource> + <ext_resource path="res://sound_coin.*" type="Sample"></ext_resource> <ext_resource path="res://sound_jump.*" type="Sample"></ext_resource> - <ext_resource path="res://osb_left.*" type="Texture"></ext_resource> + <ext_resource path="res://sound_shoot.*" type="Sample"></ext_resource> <ext_resource path="res://bullet.*" type="Texture"></ext_resource> - <ext_resource path="res://osb_jump.*" type="Texture"></ext_resource> <ext_resource path="res://osb_fire.*" type="Texture"></ext_resource> + <ext_resource path="res://osb_left.*" type="Texture"></ext_resource> <resource type="RayShape2D" path="local://1"> <real name="custom_solver_bias"> 0.5 </real> <real name="length"> 20 </real> @@ -101,8 +101,8 @@ </resource> <resource type="Animation" path="local://6"> - <string name="resource/name"> "falling_weapon" </string> - <real name="length"> 0.5 </real> + <string name="resource/name"> "run_weapon" </string> + <real name="length"> 1.25 </real> <bool name="loop"> True </bool> <real name="step"> 0.25 </real> <string name="tracks/0/type"> "value" </string> @@ -112,13 +112,18 @@ <string> "cont" </string> <bool> False </bool> <string> "transitions" </string> - <real_array len="1"> 1 </real_array> + <real_array len="6"> 1, 1, 1, 1, 1, 1 </real_array> <string> "values" </string> - <array len="1" shared="false"> - <int> 26 </int> + <array len="6" shared="false"> + <int> 5 </int> + <int> 6 </int> + <int> 7 </int> + <int> 8 </int> + <int> 9 </int> + <int> 5 </int> </array> <string> "times" </string> - <real_array len="1"> 0 </real_array> + <real_array len="6"> 0, 0.25, 0.5, 0.75, 1, 1.25 </real_array> </dictionary> </resource> @@ -145,8 +150,8 @@ </resource> <resource type="Animation" path="local://8"> - <string name="resource/name"> "run_weapon" </string> - <real name="length"> 1.25 </real> + <string name="resource/name"> "falling_weapon" </string> + <real name="length"> 0.5 </real> <bool name="loop"> True </bool> <real name="step"> 0.25 </real> <string name="tracks/0/type"> "value" </string> @@ -156,24 +161,19 @@ <string> "cont" </string> <bool> False </bool> <string> "transitions" </string> - <real_array len="6"> 1, 1, 1, 1, 1, 1 </real_array> + <real_array len="1"> 1 </real_array> <string> "values" </string> - <array len="6" shared="false"> - <int> 5 </int> - <int> 6 </int> - <int> 7 </int> - <int> 8 </int> - <int> 9 </int> - <int> 5 </int> + <array len="1" shared="false"> + <int> 26 </int> </array> <string> "times" </string> - <real_array len="6"> 0, 0.25, 0.5, 0.75, 1, 1.25 </real_array> + <real_array len="1"> 0 </real_array> </dictionary> </resource> <resource type="Animation" path="local://9"> - <string name="resource/name"> "run_gun_fire" </string> - <real name="length"> 1.25 </real> + <string name="resource/name"> "idle_weapon" </string> + <real name="length"> 0.5 </real> <bool name="loop"> True </bool> <real name="step"> 0.25 </real> <string name="tracks/0/type"> "value" </string> @@ -183,18 +183,13 @@ <string> "cont" </string> <bool> False </bool> <string> "transitions" </string> - <real_array len="6"> 1, 1, 1, 1, 1, 1 </real_array> + <real_array len="1"> 1 </real_array> <string> "values" </string> - <array len="6" shared="false"> - <int> 10 </int> - <int> 11 </int> - <int> 12 </int> - <int> 13 </int> - <int> 14 </int> - <int> 5 </int> + <array len="1" shared="false"> + <int> 25 </int> </array> <string> "times" </string> - <real_array len="6"> 0, 0.25, 0.5, 0.75, 1, 1.25 </real_array> + <real_array len="1"> 0 </real_array> </dictionary> </resource> @@ -243,8 +238,8 @@ </resource> <resource type="Animation" path="local://12"> - <string name="resource/name"> "idle_weapon" </string> - <real name="length"> 0.5 </real> + <string name="resource/name"> "run_gun_fire" </string> + <real name="length"> 1.25 </real> <bool name="loop"> True </bool> <real name="step"> 0.25 </real> <string name="tracks/0/type"> "value" </string> @@ -254,13 +249,18 @@ <string> "cont" </string> <bool> False </bool> <string> "transitions" </string> - <real_array len="1"> 1 </real_array> + <real_array len="6"> 1, 1, 1, 1, 1, 1 </real_array> <string> "values" </string> - <array len="1" shared="false"> - <int> 25 </int> + <array len="6" shared="false"> + <int> 10 </int> + <int> 11 </int> + <int> 12 </int> + <int> 13 </int> + <int> 14 </int> + <int> 5 </int> </array> <string> "times" </string> - <real_array len="1"> 0 </real_array> + <real_array len="6"> 0, 0.25, 0.5, 0.75, 1, 1.25 </real_array> </dictionary> </resource> @@ -294,7 +294,7 @@ <main_resource> <dictionary name="_bundled" shared="false"> <string> "names" </string> - <string_array len="167"> + <string_array len="170"> <string> "player" </string> <string> "RigidBody2D" </string> <string> "visibility/visible" </string> @@ -351,6 +351,8 @@ <string> "config/half_extents" </string> <string> "config/local_space" </string> <string> "config/explosiveness" </string> + <string> "config/flip_h" </string> + <string> "config/flip_v" </string> <string> "config/texture" </string> <string> "params/direction" </string> <string> "params/spread" </string> @@ -396,19 +398,20 @@ <string> "anims/idle" </string> <string> "anims/jumping" </string> <string> "anims/run" </string> - <string> "anims/falling_weapon" </string> - <string> "anims/falling" </string> <string> "anims/run_weapon" </string> - <string> "anims/standing_weapon_ready" </string> + <string> "anims/falling" </string> + <string> "anims/falling_weapon" </string> + <string> "anims/idle_weapon" </string> <string> "anims/jumping_weapon" </string> <string> "anims/crouch" </string> - <string> "anims/idle_weapon" </string> + <string> "anims/standing_weapon_ready" </string> <string> "playback/active" </string> <string> "playback/speed" </string> <string> "blend_times" </string> <string> "autoplay" </string> <string> "camera" </string> <string> "Camera2D" </string> + <string> "rotating" </string> <string> "current" </string> <string> "smoothing" </string> <string> "zoom" </string> @@ -651,7 +654,7 @@ <string> "shoot" </string> </array> <string> "nodes" </string> - <int_array len="566"> -1, -1, 1, 0, -1, 28, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 11, 7, 12, 8, 13, 9, 14, 10, 15, 8, 16, 5, 17, 11, 18, 3, 19, 3, 20, 0, 21, 8, 22, 12, 23, 8, 24, 0, 25, 0, 26, 2, 27, 3, 28, 13, 29, 14, 0, 0, 0, 31, 30, -1, 18, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 32, 15, 33, 0, 34, 2, 35, 8, 36, 8, 37, 5, 38, 16, 39, 17, 40, 18, 41, 8, 42, 19, 0, 1, 0, 44, 43, -1, 55, 2, 0, 3, 1, 4, 20, 5, 0, 45, 17, 6, 21, 7, 22, 8, 4, 46, 23, 47, 24, 48, 1, 49, 3, 50, 24, 51, 8, 52, 2, 53, 2, 54, 8, 55, 25, 56, 26, 57, 3, 58, 27, 59, 28, 60, 1, 61, 3, 62, 3, 63, 29, 64, 3, 65, 3, 66, 3, 67, 30, 68, 30, 69, 3, 70, 3, 71, 3, 72, 3, 73, 30, 74, 3, 75, 3, 76, 3, 77, 3, 78, 3, 79, 3, 80, 3, 81, 3, 82, 3, 83, 5, 84, 3, 85, 18, 86, 1, 87, 31, 88, 1, 89, 32, 90, 1, 91, 33, 92, 34, 0, 0, 0, 94, 93, -1, 17, 95, 17, 96, 3, 97, 35, 98, 36, 99, 37, 100, 38, 101, 39, 102, 40, 103, 41, 104, 42, 105, 43, 106, 44, 107, 45, 108, 0, 109, 30, 110, 46, 111, 47, 0, 0, 0, 113, 112, -1, 21, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 33, 0, 114, 0, 115, 3, 116, 4, 117, 48, 118, 48, 119, 49, 120, 49, 121, 0, 122, 0, 123, 50, 124, 50, 125, 50, 126, 50, 0, 0, 0, 128, 127, -1, 7, 2, 0, 3, 1, 4, 1, 5, 0, 6, 51, 7, 3, 8, 4, 0, 0, 0, 129, 129, -1, 9, 2, 0, 3, 1, 4, 1, 5, 0, 6, 52, 7, 3, 8, 53, 130, 6, 131, 8, 0, 0, 0, 133, 132, -1, 14, 134, 12, 135, 54, 136, 3, 137, 1, 138, 3, 139, 3, 140, 3, 141, 55, 142, 55, 143, 55, 144, 55, 145, 5, 146, 3, 147, 3, 0, 0, 0, 148, 148, -1, 9, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 149, 48, 150, 56, 0, 0, 0, 152, 151, -1, 4, 153, 48, 34, 2, 154, 3, 155, 4, 0, 9, 0, 157, 156, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 57, 7, 3, 8, 58, 158, 59, 159, 60, 160, 60, 161, 0, 162, 61, 163, 17, 0, 9, 0, 157, 164, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 62, 7, 3, 8, 58, 158, 63, 159, 60, 160, 60, 161, 0, 162, 64, 163, 17, 0, 9, 0, 157, 165, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 65, 7, 3, 8, 58, 158, 66, 159, 60, 160, 60, 161, 8, 162, 67, 163, 17, 0, 9, 0, 157, 166, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 68, 7, 3, 8, 58, 158, 69, 159, 60, 160, 60, 161, 8, 162, 70, 163, 17, 0 </int_array> + <int_array len="572"> -1, -1, 1, 0, -1, 28, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 9, 5, 10, 6, 11, 7, 12, 8, 13, 9, 14, 10, 15, 8, 16, 5, 17, 11, 18, 3, 19, 3, 20, 0, 21, 8, 22, 12, 23, 8, 24, 0, 25, 0, 26, 2, 27, 3, 28, 13, 29, 14, 0, 0, 0, 31, 30, -1, 18, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 32, 15, 33, 0, 34, 2, 35, 8, 36, 8, 37, 5, 38, 16, 39, 17, 40, 18, 41, 8, 42, 19, 0, 1, 0, 44, 43, -1, 57, 2, 0, 3, 1, 4, 20, 5, 0, 45, 17, 6, 21, 7, 22, 8, 4, 46, 23, 47, 24, 48, 1, 49, 3, 50, 24, 51, 8, 52, 2, 53, 2, 54, 8, 55, 25, 56, 8, 57, 8, 58, 26, 59, 3, 60, 27, 61, 28, 62, 1, 63, 3, 64, 3, 65, 29, 66, 3, 67, 3, 68, 3, 69, 30, 70, 30, 71, 3, 72, 3, 73, 3, 74, 3, 75, 30, 76, 3, 77, 3, 78, 3, 79, 3, 80, 3, 81, 3, 82, 3, 83, 3, 84, 3, 85, 5, 86, 3, 87, 18, 88, 1, 89, 31, 90, 1, 91, 32, 92, 1, 93, 33, 94, 34, 0, 0, 0, 96, 95, -1, 17, 97, 17, 98, 3, 99, 35, 100, 36, 101, 37, 102, 38, 103, 39, 104, 40, 105, 41, 106, 42, 107, 43, 108, 44, 109, 45, 110, 0, 111, 30, 112, 46, 113, 47, 0, 0, 0, 115, 114, -1, 22, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 33, 0, 116, 8, 117, 0, 118, 3, 119, 4, 120, 48, 121, 48, 122, 49, 123, 49, 124, 0, 125, 0, 126, 50, 127, 50, 128, 50, 129, 50, 0, 0, 0, 131, 130, -1, 7, 2, 0, 3, 1, 4, 1, 5, 0, 6, 51, 7, 3, 8, 4, 0, 0, 0, 132, 132, -1, 9, 2, 0, 3, 1, 4, 1, 5, 0, 6, 52, 7, 3, 8, 53, 133, 6, 134, 8, 0, 0, 0, 136, 135, -1, 14, 137, 12, 138, 54, 139, 3, 140, 1, 141, 3, 142, 3, 143, 3, 144, 55, 145, 55, 146, 55, 147, 55, 148, 5, 149, 3, 150, 3, 0, 0, 0, 151, 151, -1, 9, 2, 0, 3, 1, 4, 1, 5, 0, 6, 2, 7, 3, 8, 4, 152, 48, 153, 56, 0, 0, 0, 155, 154, -1, 4, 156, 48, 34, 2, 157, 3, 158, 4, 0, 9, 0, 160, 159, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 57, 7, 3, 8, 58, 161, 59, 162, 60, 163, 60, 164, 0, 165, 61, 166, 17, 0, 9, 0, 160, 167, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 62, 7, 3, 8, 58, 161, 63, 162, 60, 163, 60, 164, 0, 165, 64, 166, 17, 0, 9, 0, 160, 168, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 65, 7, 3, 8, 58, 161, 66, 162, 60, 163, 60, 164, 8, 165, 67, 166, 17, 0, 9, 0, 160, 169, -1, 13, 2, 0, 3, 1, 4, 1, 5, 0, 6, 68, 7, 3, 8, 58, 161, 69, 162, 60, 163, 60, 164, 8, 165, 70, 166, 17, 0 </int_array> <string> "conns" </string> <int_array len="0"> </int_array> </dictionary> diff --git a/demos/2d/platformer/stage.xml b/demos/2d/platformer/stage.xml index b8a54537d8..4f9cd899e5 100644 --- a/demos/2d/platformer/stage.xml +++ b/demos/2d/platformer/stage.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8" ?> -<resource_file type="PackedScene" subresource_count="9" version="0.99" version_name="Godot Engine v0.99.3735-pre-beta"> - <ext_resource path="res://music.*" type="AudioStreamOGGVorbis"></ext_resource> +<resource_file type="PackedScene" subresource_count="9" version="1.0" version_name="Godot Engine v1.0.3917-beta1"> + <ext_resource path="res://music.*" type="AudioStream"></ext_resource> <ext_resource path="res://tileset.*" type="TileSet"></ext_resource> - <ext_resource path="res://seesaw.*" type="PackedScene"></ext_resource> - <ext_resource path="res://player.*" type="PackedScene"></ext_resource> <ext_resource path="res://coin.*" type="PackedScene"></ext_resource> - <ext_resource path="res://enemy.*" type="PackedScene"></ext_resource> + <ext_resource path="res://player.*" type="PackedScene"></ext_resource> <ext_resource path="res://moving_platform.*" type="PackedScene"></ext_resource> + <ext_resource path="res://enemy.*" type="PackedScene"></ext_resource> + <ext_resource path="res://seesaw.*" type="PackedScene"></ext_resource> <ext_resource path="res://parallax_bg.*" type="PackedScene"></ext_resource> <main_resource> <dictionary name="_bundled" shared="false"> <string> "names" </string> - <string_array len="92"> + <string_array len="118"> <string> "stage" </string> <string> "Node" </string> <string> "__meta__" </string> @@ -104,15 +104,41 @@ <string> "enemy 15" </string> <string> "parallax_bg" </string> <string> "ParallaxBackground" </string> + <string> "Label" </string> + <string> "margin/left" </string> + <string> "margin/top" </string> + <string> "margin/right" </string> + <string> "margin/bottom" </string> + <string> "focus_neighbour/left" </string> + <string> "focus_neighbour/top" </string> + <string> "focus_neighbour/right" </string> + <string> "focus_neighbour/bottom" </string> + <string> "focus/ignore_mouse" </string> + <string> "focus/stop_mouse" </string> + <string> "size_flags/horizontal" </string> + <string> "size_flags/stretch_ratio" </string> + <string> "range/min" </string> + <string> "range/max" </string> + <string> "range/step" </string> + <string> "range/page" </string> + <string> "range/value" </string> + <string> "range/exp_edit" </string> + <string> "rounded_values" </string> + <string> "text" </string> + <string> "align" </string> + <string> "valign" </string> + <string> "autowrap" </string> + <string> "uppercase" </string> + <string> "percent_visible" </string> </string_array> <string> "version" </string> <int> 1 </int> <string> "conn_count" </string> <int> 0 </int> <string> "node_count" </string> - <int> 65 </int> + <int> 66 </int> <string> "variants" </string> - <array len="84" shared="false"> + <array len="95" shared="false"> <dictionary shared="false"> <string> "__editor_plugin_states__" </string> <dictionary shared="false"> @@ -133,9 +159,9 @@ <string> "pixel_snap" </string> <bool> False </bool> <string> "zoom" </string> - <real> 0.598736 </real> + <real> 1.108033 </real> <string> "ofs" </string> - <vector2> -37.7393, 205.061 </vector2> + <vector2> -19.8136, -223.194 </vector2> </dictionary> <string> "3D" </string> <dictionary shared="false"> @@ -297,7 +323,7 @@ <vector2> 450, 0 </vector2> <resource resource_type="PackedScene" path="res://seesaw.*"> </resource> <vector2> 2402.79, 849.52 </vector2> - <resource resource_type="AudioStreamOGGVorbis" path="res://music.*"> </resource> + <resource resource_type="AudioStream" path="res://music.*"> </resource> <bool> False </bool> <real> 2 </real> <resource resource_type="PackedScene" path="res://enemy.*"> </resource> @@ -313,9 +339,20 @@ <vector2> 3546.2, 1356.19 </vector2> <vector2> 2406.63, 815.115 </vector2> <resource resource_type="PackedScene" path="res://parallax_bg.*"> </resource> + <real> 12 </real> + <real> -202 </real> + <real> 358 </real> + <real> -10 </real> + <node_path> "" </node_path> + <int> 2 </int> + <real> 14 </real> + <real> 14.769231 </real> + <string> "This is a simple demo on how to make a platformer game with Godot. This version uses physics and the 2D physics engine for motion and collision. The demo also shows the benefits of using the scene system, where coins, enemies and the player are edited separatedly and instanced in the stage. To edit the base tiles for the tileset, open the tileset_edit.xml file and follow instructions. " </string> + <int> 0 </int> + <real> -1 </real> </array> <string> "nodes" </string> - <int_array len="623"> -1, -1, 1, 0, -1, 1, 2, 0, 0, 0, 0, 4, 3, -1, 12, 5, 1, 6, 2, 7, 2, 8, 1, 9, 3, 10, 4, 11, 5, 12, 6, 13, 7, 14, 8, 15, 9, 2, 10, 0, 0, 0, 1, 16, -1, 1, 2, 11, 0, 2, 0, 18, 17, 12, 1, 9, 13, 0, 2, 0, 18, 19, 12, 1, 9, 14, 0, 2, 0, 18, 20, 12, 1, 9, 15, 0, 2, 0, 18, 21, 12, 1, 9, 16, 0, 2, 0, 18, 22, 12, 1, 9, 17, 0, 2, 0, 18, 23, 12, 1, 9, 18, 0, 2, 0, 18, 24, 12, 1, 9, 19, 0, 2, 0, 18, 25, 12, 1, 9, 20, 0, 2, 0, 18, 26, 12, 1, 9, 21, 0, 2, 0, 18, 27, 12, 1, 9, 22, 0, 2, 0, 18, 28, 12, 1, 9, 23, 0, 2, 0, 18, 29, 12, 1, 9, 24, 0, 2, 0, 18, 30, 12, 1, 9, 25, 0, 2, 0, 18, 31, 12, 1, 9, 26, 0, 2, 0, 18, 32, 12, 1, 9, 27, 0, 2, 0, 18, 33, 12, 1, 9, 28, 0, 2, 0, 18, 34, 12, 1, 9, 29, 0, 2, 0, 18, 35, 12, 1, 9, 30, 0, 2, 0, 18, 36, 12, 1, 9, 31, 0, 2, 0, 18, 37, 12, 1, 9, 32, 0, 2, 0, 18, 38, 12, 1, 9, 33, 0, 2, 0, 18, 39, 12, 1, 9, 34, 0, 2, 0, 18, 40, 12, 1, 9, 35, 0, 2, 0, 18, 41, 12, 1, 9, 36, 0, 2, 0, 18, 42, 12, 1, 9, 37, 0, 2, 0, 18, 43, 12, 1, 9, 38, 0, 2, 0, 18, 44, 12, 1, 9, 39, 0, 2, 0, 18, 45, 12, 1, 9, 40, 0, 2, 0, 18, 46, 12, 1, 9, 41, 0, 2, 0, 18, 47, 12, 1, 9, 42, 0, 2, 0, 18, 48, 12, 1, 9, 43, 0, 2, 0, 18, 49, 12, 1, 9, 44, 0, 2, 0, 18, 50, 12, 1, 9, 45, 0, 2, 0, 18, 51, 12, 1, 9, 46, 0, 2, 0, 18, 52, 12, 1, 9, 47, 0, 2, 0, 18, 53, 12, 1, 9, 48, 0, 2, 0, 18, 54, 12, 1, 9, 49, 0, 2, 0, 18, 55, 12, 1, 9, 50, 0, 2, 0, 18, 56, 12, 1, 9, 51, 0, 2, 0, 18, 57, 12, 1, 9, 52, 0, 2, 0, 18, 58, 12, 1, 9, 53, 0, 2, 0, 18, 59, 12, 1, 9, 54, 0, 0, 0, 61, 60, 55, 1, 9, 56, 0, 0, 0, 1, 62, -1, 0, 0, 46, 0, 64, 63, 57, 3, 9, 58, 65, 59, 66, 60, 0, 46, 0, 64, 67, 57, 3, 9, 61, 65, 62, 66, 63, 0, 46, 0, 64, 68, 57, 3, 9, 64, 65, 65, 66, 63, 0, 46, 0, 64, 69, 66, 1, 9, 67, 0, 0, 0, 71, 70, -1, 6, 72, 68, 73, 69, 74, 1, 75, 70, 76, 1, 77, 69, 0, 0, 0, 1, 78, -1, 0, 0, 52, 0, 61, 79, 71, 1, 9, 72, 0, 52, 0, 61, 80, 71, 1, 9, 73, 0, 52, 0, 61, 81, 71, 1, 9, 74, 0, 52, 0, 61, 82, 71, 1, 9, 75, 0, 52, 0, 61, 83, 71, 1, 9, 76, 0, 52, 0, 61, 84, 71, 1, 9, 77, 0, 52, 0, 61, 85, 71, 1, 9, 78, 0, 52, 0, 61, 86, 71, 1, 9, 79, 0, 52, 0, 61, 87, 71, 1, 9, 80, 0, 52, 0, 61, 88, 71, 1, 9, 81, 0, 52, 0, 61, 89, 71, 1, 9, 82, 0, 0, 0, 91, 90, 83, 0, 0 </int_array> + <int_array len="688"> -1, -1, 1, 0, -1, 1, 2, 0, 0, 0, 0, 4, 3, -1, 12, 5, 1, 6, 2, 7, 2, 8, 1, 9, 3, 10, 4, 11, 5, 12, 6, 13, 7, 14, 8, 15, 9, 2, 10, 0, 0, 0, 1, 16, -1, 1, 2, 11, 0, 2, 0, 18, 17, 12, 1, 9, 13, 0, 2, 0, 18, 19, 12, 1, 9, 14, 0, 2, 0, 18, 20, 12, 1, 9, 15, 0, 2, 0, 18, 21, 12, 1, 9, 16, 0, 2, 0, 18, 22, 12, 1, 9, 17, 0, 2, 0, 18, 23, 12, 1, 9, 18, 0, 2, 0, 18, 24, 12, 1, 9, 19, 0, 2, 0, 18, 25, 12, 1, 9, 20, 0, 2, 0, 18, 26, 12, 1, 9, 21, 0, 2, 0, 18, 27, 12, 1, 9, 22, 0, 2, 0, 18, 28, 12, 1, 9, 23, 0, 2, 0, 18, 29, 12, 1, 9, 24, 0, 2, 0, 18, 30, 12, 1, 9, 25, 0, 2, 0, 18, 31, 12, 1, 9, 26, 0, 2, 0, 18, 32, 12, 1, 9, 27, 0, 2, 0, 18, 33, 12, 1, 9, 28, 0, 2, 0, 18, 34, 12, 1, 9, 29, 0, 2, 0, 18, 35, 12, 1, 9, 30, 0, 2, 0, 18, 36, 12, 1, 9, 31, 0, 2, 0, 18, 37, 12, 1, 9, 32, 0, 2, 0, 18, 38, 12, 1, 9, 33, 0, 2, 0, 18, 39, 12, 1, 9, 34, 0, 2, 0, 18, 40, 12, 1, 9, 35, 0, 2, 0, 18, 41, 12, 1, 9, 36, 0, 2, 0, 18, 42, 12, 1, 9, 37, 0, 2, 0, 18, 43, 12, 1, 9, 38, 0, 2, 0, 18, 44, 12, 1, 9, 39, 0, 2, 0, 18, 45, 12, 1, 9, 40, 0, 2, 0, 18, 46, 12, 1, 9, 41, 0, 2, 0, 18, 47, 12, 1, 9, 42, 0, 2, 0, 18, 48, 12, 1, 9, 43, 0, 2, 0, 18, 49, 12, 1, 9, 44, 0, 2, 0, 18, 50, 12, 1, 9, 45, 0, 2, 0, 18, 51, 12, 1, 9, 46, 0, 2, 0, 18, 52, 12, 1, 9, 47, 0, 2, 0, 18, 53, 12, 1, 9, 48, 0, 2, 0, 18, 54, 12, 1, 9, 49, 0, 2, 0, 18, 55, 12, 1, 9, 50, 0, 2, 0, 18, 56, 12, 1, 9, 51, 0, 2, 0, 18, 57, 12, 1, 9, 52, 0, 2, 0, 18, 58, 12, 1, 9, 53, 0, 2, 0, 18, 59, 12, 1, 9, 54, 0, 0, 0, 61, 60, 55, 1, 9, 56, 0, 0, 0, 1, 62, -1, 0, 0, 46, 0, 64, 63, 57, 3, 9, 58, 65, 59, 66, 60, 0, 46, 0, 64, 67, 57, 3, 9, 61, 65, 62, 66, 63, 0, 46, 0, 64, 68, 57, 3, 9, 64, 65, 65, 66, 63, 0, 46, 0, 64, 69, 66, 1, 9, 67, 0, 0, 0, 71, 70, -1, 6, 72, 68, 73, 69, 74, 1, 75, 70, 76, 1, 77, 69, 0, 0, 0, 1, 78, -1, 0, 0, 52, 0, 61, 79, 71, 1, 9, 72, 0, 52, 0, 61, 80, 71, 1, 9, 73, 0, 52, 0, 61, 81, 71, 1, 9, 74, 0, 52, 0, 61, 82, 71, 1, 9, 75, 0, 52, 0, 61, 83, 71, 1, 9, 76, 0, 52, 0, 61, 84, 71, 1, 9, 77, 0, 52, 0, 61, 85, 71, 1, 9, 78, 0, 52, 0, 61, 86, 71, 1, 9, 79, 0, 52, 0, 61, 87, 71, 1, 9, 80, 0, 52, 0, 61, 88, 71, 1, 9, 81, 0, 52, 0, 61, 89, 71, 1, 9, 82, 0, 0, 0, 91, 90, 83, 0, 0, 0, 0, 92, 92, -1, 29, 5, 1, 6, 2, 7, 2, 8, 1, 93, 84, 94, 85, 95, 86, 96, 87, 97, 88, 98, 88, 99, 88, 100, 88, 101, 1, 102, 1, 103, 89, 104, 2, 105, 4, 106, 90, 107, 2, 108, 91, 109, 4, 110, 69, 111, 69, 112, 92, 113, 93, 114, 93, 115, 1, 116, 69, 117, 94, 0 </int_array> <string> "conns" </string> <int_array len="0"> </int_array> </dictionary> diff --git a/demos/2d/platformer/tileset_edit.xml b/demos/2d/platformer/tileset_edit.xml index 4778a8f1e2..6d5b84deaa 100644 --- a/demos/2d/platformer/tileset_edit.xml +++ b/demos/2d/platformer/tileset_edit.xml @@ -1,88 +1,68 @@ <?xml version="1.0" encoding="UTF-8" ?> -<resource_file type="PackedScene" subresource_count="12" version="0.99" version_name="Godot Engine v0.99.3037-pre-beta"> - <ext_resource path="res://tiles_demo.png" type="Texture"></ext_resource> - <resource type="ConvexPolygonShape2D" path="local://0"> - <string name="resource/name"> "" </string> - <real name="custom_solver_bias"> 0 </real> - <vector2_array name="points" len="4"> 0, 8, 64, 8, 64, 64, 0, 64 </vector2_array> - <resource name="script/script"></resource> - </resource> +<resource_file type="PackedScene" subresource_count="12" version="1.0" version_name="Godot Engine v1.0.3917-beta1"> + <ext_resource path="res://tiles_demo.*" type="Texture"></ext_resource> <resource type="ConvexPolygonShape2D" path="local://1"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> - <vector2_array name="points" len="4"> 0, 64, 0, 8, 56, 8, 56, 64 </vector2_array> - <resource name="script/script"></resource> + <vector2_array name="points" len="4"> 0, 8, 64, 8, 64, 64, 0, 64 </vector2_array> + </resource> <resource type="ConvexPolygonShape2D" path="local://2"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> - <vector2_array name="points" len="4"> 0, 64, 0, 0, 56, 0, 56, 64 </vector2_array> - <resource name="script/script"></resource> + <vector2_array name="points" len="4"> 0, 64, 0, 8, 56, 8, 56, 64 </vector2_array> + </resource> <resource type="ConvexPolygonShape2D" path="local://3"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> <vector2_array name="points" len="4"> 0, 64, 0, 0, 56, 0, 56, 64 </vector2_array> - <resource name="script/script"></resource> + </resource> <resource type="ConvexPolygonShape2D" path="local://4"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> - <vector2_array name="points" len="5"> 0, 64, 0, 0, 56, 0, 64, 8, 64, 64 </vector2_array> - <resource name="script/script"></resource> + <vector2_array name="points" len="4"> 0, 64, 0, 0, 56, 0, 56, 64 </vector2_array> + </resource> <resource type="ConvexPolygonShape2D" path="local://5"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> - <vector2_array name="points" len="4"> 0, 8, 64, 72, 64, 128, 0, 128 </vector2_array> - <resource name="script/script"></resource> + <vector2_array name="points" len="5"> 0, 64, 0, 0, 56, 0, 64, 8, 64, 64 </vector2_array> + </resource> <resource type="ConvexPolygonShape2D" path="local://6"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> - <vector2_array name="points" len="4"> 0, 64, 0, 8, 64, 8, 64, 64 </vector2_array> - <resource name="script/script"></resource> + <vector2_array name="points" len="4"> 0, 8, 64, 72, 64, 128, 0, 128 </vector2_array> + </resource> <resource type="ConvexPolygonShape2D" path="local://7"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> <vector2_array name="points" len="4"> 0, 64, 0, 8, 64, 8, 64, 64 </vector2_array> - <resource name="script/script"></resource> + </resource> <resource type="ConvexPolygonShape2D" path="local://8"> - <string name="resource/name"> "" </string> <real name="custom_solver_bias"> 0 </real> - <vector2_array name="points" len="4"> 0, 0, 64, 0, 64, 64, 0, 64 </vector2_array> - <resource name="script/script"></resource> + <vector2_array name="points" len="4"> 0, 64, 0, 8, 64, 8, 64, 64 </vector2_array> + </resource> <resource type="ConvexPolygonShape2D" path="local://9"> - <string name="resource/name"> "" </string> + <real name="custom_solver_bias"> 0 </real> + <vector2_array name="points" len="4"> 0, 0, 64, 0, 64, 64, 0, 64 </vector2_array> + + </resource> + <resource type="ConvexPolygonShape2D" path="local://10"> <real name="custom_solver_bias"> 0 </real> <vector2_array name="points" len="4"> 0, 64, 0, 0, 56, 0, 56, 64 </vector2_array> - <resource name="script/script"></resource> + </resource> <main_resource> - <string name="resource/name"> "" </string> - <dictionary name="_bundled"> + <dictionary name="_bundled" shared="false"> <string> "names" </string> - <string_array len="86"> + <string_array len="76"> <string> "Node" </string> - <string> "process/process" </string> - <string> "process/fixed_process" </string> - <string> "process/input" </string> - <string> "process/unhandled_input" </string> - <string> "process/mode" </string> - <string> "script/script" </string> <string> "__meta__" </string> <string> "floor" </string> <string> "Sprite" </string> <string> "visibility/visible" </string> - <string> "visibility/toplevel" </string> <string> "visibility/opacity" </string> <string> "visibility/self_opacity" </string> <string> "visibility/on_top" </string> - <string> "visibility/blend_mode" </string> - <string> "transform/notify" </string> <string> "transform/pos" </string> <string> "transform/rot" </string> <string> "transform/scale" </string> @@ -102,9 +82,12 @@ <string> "shape_count" </string> <string> "shapes/0/shape" </string> <string> "shapes/0/transform" </string> + <string> "shapes/0/trigger" </string> <string> "simulate_motion" </string> <string> "constant_linear_velocity" </string> <string> "constant_angular_velocity" </string> + <string> "friction" </string> + <string> "bounce" </string> <string> "CollisionPolygon2D" </string> <string> "build_mode" </string> <string> "polygon" </string> @@ -123,15 +106,10 @@ <string> "ceiling2wall" </string> <string> "help" </string> <string> "Label" </string> - <string> "anchor/left" </string> - <string> "anchor/top" </string> - <string> "anchor/right" </string> - <string> "anchor/bottom" </string> <string> "margin/left" </string> <string> "margin/top" </string> <string> "margin/right" </string> <string> "margin/bottom" </string> - <string> "hint/tooltip" </string> <string> "focus_neighbour/left" </string> <string> "focus_neighbour/top" </string> <string> "focus_neighbour/right" </string> @@ -139,7 +117,6 @@ <string> "focus/ignore_mouse" </string> <string> "focus/stop_mouse" </string> <string> "size_flags/horizontal" </string> - <string> "size_flags/vertical" </string> <string> "size_flags/stretch_ratio" </string> <string> "range/min" </string> <string> "range/max" </string> @@ -152,6 +129,8 @@ <string> "align" </string> <string> "valign" </string> <string> "autowrap" </string> + <string> "uppercase" </string> + <string> "percent_visible" </string> </string_array> <string> "version" </string> <int> 1 </int> @@ -160,50 +139,98 @@ <string> "node_count" </string> <int> 36 </int> <string> "variants" </string> - <array len="66"> - <bool> False </bool> - <int> 0 </int> - <resource name=""></resource> <dictionary> + <array len="65" shared="false"> + <dictionary shared="false"> <string> "__editor_plugin_states__" </string> - <dictionary> + <dictionary shared="false"> <string> "2D" </string> - <dictionary> + <dictionary shared="false"> + <string> "pixel_snap" </string> + <bool> False </bool> <string> "zoom" </string> - <real> 3.09087 </real> + <real> 1.360374 </real> <string> "ofs" </string> - <vector2> -2.41578, -57.0874 </vector2> + <vector2> 272.509, -91.6367 </vector2> </dictionary> <string> "3D" </string> - <dictionary> + <dictionary shared="false"> <string> "zfar" </string> <real> 500 </real> <string> "fov" </string> <real> 45 </real> - <string> "window_mode" </string> - <int> 0 </int> - <string> "window_0" </string> - <dictionary> - <string> "distance" </string> - <real> 4 </real> - <string> "default_light" </string> - <bool> True </bool> - <string> "x_rot" </string> - <real> 0.337 </real> - <string> "y_rot" </string> - <real> -0.575 </real> - <string> "show_grid" </string> - <bool> True </bool> - <string> "show_origin" </string> - <bool> True </bool> - <string> "pos" </string> - <vector3> 0, 0, 0 </vector3> - </dictionary> + <string> "viewports" </string> + <array len="4" shared="false"> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + <dictionary shared="false"> + <string> "distance" </string> + <real> 4 </real> + <string> "x_rot" </string> + <real> 0 </real> + <string> "y_rot" </string> + <real> 0 </real> + <string> "use_orthogonal" </string> + <bool> False </bool> + <string> "use_environment" </string> + <bool> False </bool> + <string> "pos" </string> + <vector3> 0, 0, 0 </vector3> + </dictionary> + </array> + <string> "viewport_mode" </string> + <int> 1 </int> + <string> "default_light" </string> + <bool> True </bool> + <string> "show_grid" </string> + <bool> True </bool> + <string> "show_origin" </string> + <bool> True </bool> <string> "znear" </string> <real> 0.1 </real> </dictionary> </dictionary> <string> "__editor_run_settings__" </string> - <dictionary> + <dictionary shared="false"> <string> "custom_args" </string> <string> "-l $scene" </string> <string> "run_mode" </string> @@ -213,44 +240,45 @@ <string> "2D" </string> </dictionary> <bool> True </bool> - <real> 1 </real> + <nil> </nil> <vector2> 0, 0 </vector2> - <real> 0 </real> + <nil> </nil> <vector2> 1, 1 </vector2> - <resource resource_type="Texture" path="res://tiles_demo.png"> </resource> + <resource resource_type="Texture" path="res://tiles_demo.*"> </resource> + <nil> </nil> <int> 1 </int> + <nil> </nil> <color> 1, 1, 1, 1 </color> <rect2> 0, 0, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://0"> </resource> + <resource resource_type="Shape2D" path="local://1"> </resource> <matrix32> 1, -0, 0, 1, 0, 0 </matrix32> - <int> 2 </int> <vector2_array len="4"> 64, 8, 64, 64, 0, 64, 0, 8 </vector2_array> <vector2> 64, 0 </vector2> <rect2> 64, 0, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://1"> </resource> + <resource resource_type="Shape2D" path="local://2"> </resource> <vector2_array len="4"> 0, 8, 56, 8, 56, 64, 0, 64 </vector2_array> <vector2> 64, 64 </vector2> <rect2> 64, 64, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://2"> </resource> + <resource resource_type="Shape2D" path="local://3"> </resource> <vector2_array len="4"> 0, 0, 56, 0, 56, 64, 0, 64 </vector2_array> <vector2> 64, 128 </vector2> <rect2> 320, 128, 128, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://3"> </resource> + <resource resource_type="Shape2D" path="local://4"> </resource> <vector2> 64, 192 </vector2> <rect2> 64, 128, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://4"> </resource> + <resource resource_type="Shape2D" path="local://5"> </resource> <vector2_array len="5"> 0, 0, 56, 0, 64, 8, 64, 64, 0, 64 </vector2_array> <vector2> 256, 192 </vector2> <rect2> 128, 128, 64, 128 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://5"> </resource> + <resource resource_type="Shape2D" path="local://6"> </resource> <vector2_array len="4"> 0, 8, 64, 72, 64, 128, 0, 128 </vector2_array> <vector2> 128, 192 </vector2> <rect2> 192, 192, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://6"> </resource> + <resource resource_type="Shape2D" path="local://7"> </resource> <vector2_array len="4"> 0, 64, 64, 64, 64, 8, 0, 8 </vector2_array> <vector2> 192, 192 </vector2> <rect2> 256, 192, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://7"> </resource> + <resource resource_type="Shape2D" path="local://8"> </resource> <vector2> 192, 128 </vector2> <rect2> 256, 128, 64, 64 </rect2> <vector2> 192, 64 </vector2> @@ -261,25 +289,26 @@ <rect2> 0, 64, 64, 64 </rect2> <vector2> 0, 128 </vector2> <rect2> 384, 64, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://8"> </resource> + <resource resource_type="Shape2D" path="local://9"> </resource> <vector2_array len="4"> 64, 0, 64, 64, 0, 64, 0, 0 </vector2_array> <vector2> 0, 192 </vector2> <rect2> 448, 64, 64, 64 </rect2> - <resource resource_type="ConvexPolygonShape2D" path="local://9"> </resource> - <real> 296 </real> - <real> 8 </real> - <real> 596 </real> - <real> 125 </real> - <string> "" </string> - <node_path> "" </node_path> - <real> 14 </real> - <string> "This scene serves as a tool for editing the tileset. Nodes (sprites) and their respective collisions are edited here. To create a tileset from this, a "TileSet" resoucre must be created. this resource adds a menu which allows generating of the tileset data from the scene. or optionally merge it if one already exists (by looking at identical tile names). Finally, the saved tileset resource (tileset.xml in this case), can be opened to be used into a TileMap node for editing a tile map. " </string> + <resource resource_type="Shape2D" path="local://10"> </resource> + <nil> </nil> + <nil> </nil> + <nil> </nil> + <nil> </nil> + <nil> </nil> + <int> 2 </int> + <nil> </nil> + <string> "This scene serves as a tool for editing the tileset. Nodes (sprites) and their respective collisions are edited here. To create a tileset from this, a "TileSet" resoucre must be created. Use the helper in: Scene -< Convert To -< TileSet This will save a tileset. Saving over it will merge your changes. Finally, the saved tileset resource (tileset.xml in this case), can be opened to be used into a TileMap node for editing a tile map. " </string> + <real> -1 </real> </array> <string> "nodes" </string> - <int_array len="1906"> -1, -1, 0, 0, -1, 7, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 6, 2, 7, 3, 0, 0, 0, 9, 8, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 6, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 12, 6, 2, 0, 1, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 13, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 2, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 16, 6, 2, 0, 0, 0, 9, 42, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 17, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 18, 6, 2, 0, 4, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 19, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 5, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 20, 6, 2, 0, 0, 0, 9, 43, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 21, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 22, 6, 2, 0, 7, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 23, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 8, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 24, 6, 2, 0, 0, 0, 9, 44, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 25, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 26, 6, 2, 0, 10, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 27, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 11, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 24, 6, 2, 0, 0, 0, 9, 45, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 28, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 29, 6, 2, 0, 13, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 30, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 14, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 31, 6, 2, 0, 0, 0, 9, 46, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 32, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 33, 6, 2, 0, 16, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 34, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 17, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 35, 6, 2, 0, 0, 0, 9, 47, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 36, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 37, 6, 2, 0, 19, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 38, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 20, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 39, 6, 2, 0, 0, 0, 9, 48, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 40, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 41, 6, 2, 0, 22, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 42, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 23, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 39, 6, 2, 0, 0, 0, 9, 49, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 43, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 44, 6, 2, 0, 0, 0, 9, 50, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 45, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 46, 6, 2, 0, 0, 0, 9, 51, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 47, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 48, 6, 2, 0, 0, 0, 9, 52, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 49, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 50, 6, 2, 0, 0, 0, 9, 53, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 51, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 52, 6, 2, 0, 29, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 53, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 30, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 54, 6, 2, 0, 0, 0, 9, 54, -1, 27, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 17, 55, 18, 7, 19, 8, 20, 9, 21, 0, 22, 6, 23, 0, 24, 0, 25, 10, 26, 10, 27, 1, 28, 11, 29, 4, 30, 56, 6, 2, 0, 32, 0, 32, 31, -1, 22, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 33, 10, 34, 57, 35, 14, 36, 0, 37, 6, 38, 7, 6, 2, 0, 33, 0, 39, 39, -1, 18, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 4, 17, 6, 18, 7, 19, 8, 40, 15, 41, 24, 6, 2, 0, 0, 0, 56, 55, -1, 42, 1, 0, 2, 0, 3, 0, 4, 0, 5, 1, 10, 4, 11, 0, 12, 5, 13, 5, 14, 4, 15, 1, 16, 0, 57, 1, 58, 1, 59, 1, 60, 1, 61, 58, 62, 59, 63, 60, 64, 61, 65, 62, 66, 63, 67, 63, 68, 63, 69, 63, 70, 4, 71, 4, 72, 15, 73, 1, 74, 5, 75, 7, 76, 64, 77, 5, 78, 64, 79, 7, 80, 0, 81, 0, 82, 65, 83, 1, 84, 1, 85, 0, 6, 2, 0 </int_array> + <int_array len="1316"> -1, -1, 0, 0, -1, 1, 1, 0, 0, 0, 0, 3, 2, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 11, 0, 1, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 12, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 2, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 14, 0, 0, 0, 3, 36, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 15, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 16, 0, 4, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 17, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 5, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 18, 0, 0, 0, 3, 37, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 19, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 20, 0, 7, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 21, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 8, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 22, 0, 0, 0, 3, 38, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 23, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 24, 0, 10, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 25, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 11, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 22, 0, 0, 0, 3, 39, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 26, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 27, 0, 13, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 28, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 14, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 29, 0, 0, 0, 3, 40, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 30, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 31, 0, 16, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 32, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 17, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 33, 0, 0, 0, 3, 41, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 34, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 35, 0, 19, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 36, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 20, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 37, 0, 0, 0, 3, 42, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 38, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 39, 0, 22, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 40, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 23, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 37, 0, 0, 0, 3, 43, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 41, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 42, 0, 0, 0, 3, 44, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 43, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 44, 0, 0, 0, 3, 45, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 45, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 46, 0, 0, 0, 3, 46, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 47, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 48, 0, 0, 0, 3, 47, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 49, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 50, 0, 29, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 51, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 30, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 52, 0, 0, 0, 3, 48, -1, 18, 4, 1, 5, 2, 6, 2, 7, 1, 8, 53, 9, 4, 10, 5, 11, 6, 12, 7, 13, 3, 14, 7, 15, 7, 16, 8, 17, 8, 18, 9, 19, 10, 20, 1, 21, 54, 0, 32, 0, 23, 22, -1, 16, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 24, 8, 25, 55, 26, 13, 27, 7, 28, 7, 29, 3, 30, 4, 31, 2, 32, 4, 0, 33, 0, 33, 33, -1, 9, 4, 1, 5, 2, 6, 2, 7, 1, 8, 3, 9, 4, 10, 5, 34, 9, 35, 22, 0, 0, 0, 50, 49, -1, 29, 4, 1, 5, 2, 6, 2, 7, 1, 51, 56, 52, 57, 53, 58, 54, 59, 55, 60, 56, 60, 57, 60, 58, 60, 59, 1, 60, 1, 61, 61, 62, 2, 63, 4, 64, 62, 65, 2, 66, 62, 67, 4, 68, 7, 69, 7, 70, 63, 71, 9, 72, 9, 73, 7, 74, 7, 75, 64, 0 </int_array> <string> "conns" </string> <int_array len="0"> </int_array> </dictionary> - <resource name="script/script"></resource> + </main_resource> </resource_file>
\ No newline at end of file |