From dee8e3d29d1f5f78891e5921f73737f8fab1e288 Mon Sep 17 00:00:00 2001 From: Hamcha Date: Tue, 7 Jul 2020 14:51:30 +0200 Subject: [PATCH] Add plating and separate layers --- Actors/Player/Player.gd | 14 +++---- Graphics/tgstation/base.tres | 19 +++++++++ Graphics/tgstation/floor.tres | 19 +++++++++ Graphics/tgstation/plating.png | Bin 0 -> 363 bytes Graphics/tgstation/plating.png.import | 34 +++++++++++++++ Graphics/tgstation/{2x2.tres => walls.tres} | 17 +------- Scenes/Map.gd | 5 +-- Scenes/Maps/odyssey.gd | 9 ++++ Scenes/Maps/odyssey.tscn | 44 ++++++++++++++++---- Scenes/Rendering/MapTiles.gd | 10 +---- Scenes/World.gd | 5 ++- project.godot | 12 +++--- 12 files changed, 137 insertions(+), 51 deletions(-) mode change 100755 => 100644 Actors/Player/Player.gd create mode 100644 Graphics/tgstation/base.tres create mode 100644 Graphics/tgstation/floor.tres create mode 100644 Graphics/tgstation/plating.png create mode 100644 Graphics/tgstation/plating.png.import rename Graphics/tgstation/{2x2.tres => walls.tres} (74%) create mode 100644 Scenes/Maps/odyssey.gd mode change 100755 => 100644 Scenes/World.gd diff --git a/Actors/Player/Player.gd b/Actors/Player/Player.gd old mode 100755 new mode 100644 index 7e54b50..1142796 --- a/Actors/Player/Player.gd +++ b/Actors/Player/Player.gd @@ -12,7 +12,7 @@ var stamina = MAX_STAMINA var speed_boost = 0 export(NodePath) var mapNode -onready var map = get_node(mapNode) as Map +onready var map = get_node(mapNode) as GameMap export var is_controlled = false setget set_is_controlled @@ -50,13 +50,11 @@ func _physics_process(delta): velocity = move_and_slide(velocity) # Check what tile I'm on - var tilemap = map.tilemap as TileMap - var cell = tilemap.get_cellv(tilemap.world_to_map(transform.origin)) - match cell: - -1: # I'm in outer space! - grip = 0 - _: - grip = 1 + grip = 0.0 + for tilemap in map.tilemaps: + var cell = tilemap.get_cellv(tilemap.world_to_map(transform.origin)) + if cell >= 0: + grip = 1.0 func set_is_controlled(val): is_controlled = val diff --git a/Graphics/tgstation/base.tres b/Graphics/tgstation/base.tres new file mode 100644 index 0000000..821d250 --- /dev/null +++ b/Graphics/tgstation/base.tres @@ -0,0 +1,19 @@ +[gd_resource type="TileSet" load_steps=2 format=2] + +[ext_resource path="res://Graphics/tgstation/plating.png" type="Texture" id=1] + +[resource] +0/name = "Plating" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 32, 32 ) +0/tile_mode = 0 +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape_one_way = false +0/shape_one_way_margin = 0.0 +0/shapes = [ ] +0/z_index = 0 diff --git a/Graphics/tgstation/floor.tres b/Graphics/tgstation/floor.tres new file mode 100644 index 0000000..12eff69 --- /dev/null +++ b/Graphics/tgstation/floor.tres @@ -0,0 +1,19 @@ +[gd_resource type="TileSet" load_steps=2 format=2] + +[ext_resource path="res://Graphics/tgstation/floor.png" type="Texture" id=1] + +[resource] +1/name = "Floor" +1/texture = ExtResource( 1 ) +1/tex_offset = Vector2( 0, 0 ) +1/modulate = Color( 1, 1, 1, 1 ) +1/region = Rect2( 0, 0, 32, 32 ) +1/tile_mode = 0 +1/occluder_offset = Vector2( 0, 0 ) +1/navigation_offset = Vector2( 0, 0 ) +1/shape_offset = Vector2( 0, 0 ) +1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +1/shape_one_way = false +1/shape_one_way_margin = 0.0 +1/shapes = [ ] +1/z_index = 0 diff --git a/Graphics/tgstation/plating.png b/Graphics/tgstation/plating.png new file mode 100644 index 0000000000000000000000000000000000000000..418e631327e4e5cc93e6c67a145909a2c3957367 GIT binary patch literal 363 zcmV-x0hIoUP)K(2CCwatk4JSL|r&fUf_K2sNM~_Ks0zwFz=MsNa!?=v&C~n8^K&!QeQVK-$v1Vk9fphNXJdmO`quPw>PFPF8 zN&Za