From 2f7b47fa4de8877cfac98c20763be1abdc4c3a9d Mon Sep 17 00:00:00 2001 From: Anthony Wilcox <35226681+tonytins@users.noreply.github.com> Date: Fri, 29 Nov 2019 11:05:56 -0500 Subject: [PATCH] WIP update to terrian tileset - Updating the terrian tileset as terrian_cl (Terrian City Limits) so that it's better optimized to work with the auto tile engine. - Fixed typo in gitignore --- .gitattributes | 63 +++++++++++++++++++++++++++++ .gitiginore => .gitignore | 43 ++++++++++++++++++-- assets/terrain_cl.ase | Bin 0 -> 6765 bytes src/graphics/terrain_cl.png | Bin 0 -> 9147 bytes src/graphics/terrain_cl.png.import | 34 ++++++++++++++++ src/graphics/terrian.tres | 24 +++++++++++ src/project.godot | 3 +- src/world.gd | 25 ++++++++++++ src/world.tscn | 10 +++-- src/world_gen.gd | 36 ----------------- 10 files changed, 194 insertions(+), 44 deletions(-) create mode 100644 .gitattributes rename .gitiginore => .gitignore (75%) create mode 100644 assets/terrain_cl.ase create mode 100644 src/graphics/terrain_cl.png create mode 100644 src/graphics/terrain_cl.png.import create mode 100644 src/graphics/terrian.tres create mode 100644 src/world.gd delete mode 100644 src/world_gen.gd diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitiginore b/.gitignore similarity index 75% rename from .gitiginore rename to .gitignore index 09e0014..cbc6def 100644 --- a/.gitiginore +++ b/.gitignore @@ -1,5 +1,10 @@ -# Created by https://www.gitignore.io/api/linux,godot,macos,backup,windows,visualstudiocode -# Edit at https://www.gitignore.io/?templates=linux,godot,macos,backup,windows,visualstudiocode +### Audio ### + +*.wav +*.ogg + +# Created by https://www.gitignore.io/api/linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode +# Edit at https://www.gitignore.io/?templates=linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode ### Backup ### *.bak @@ -8,6 +13,28 @@ *.orig *.tmp +### DotnetCore ### +# .NET Core build folders +/bin +/obj + +# Common node modules locations +/node_modules +/wwwroot/node_modules + + +### Executable ### +*.app +*.bat +*.cgi +*.com +*.exe +*.gadget +*.jar +*.pif +*.vb +*.wsf + ### Godot ### # Godot-specific ignores @@ -61,6 +88,16 @@ Network Trash Folder Temporary Items .apdisk +### MonoDevelop ### +#User Specific +*.userprefs +*.usertasks + +#Mono Project Files +*.pidb +*.resources +test-results/ + ### VisualStudioCode ### .vscode/* !.vscode/settings.json @@ -98,4 +135,4 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -# End of https://www.gitignore.io/api/linux,godot,macos,backup,windows,visualstudiocode \ No newline at end of file +# End of https://www.gitignore.io/api/linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode \ No newline at end of file diff --git a/assets/terrain_cl.ase b/assets/terrain_cl.ase new file mode 100644 index 0000000000000000000000000000000000000000..0e81af37fe840c24f0e4dc318cea1a6afb1e1df8 GIT binary patch literal 6765 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 J#$fdQe*vuAq=5hc literal 0 HcmV?d00001 diff --git a/src/graphics/terrain_cl.png b/src/graphics/terrain_cl.png new file mode 100644 index 0000000000000000000000000000000000000000..879317f2ad01dd90746a57c386f1652ca88f7c3a GIT binary patch literal 9147 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 R{1fE>R28*g)$*2M{|6GUu5ADS literal 0 HcmV?d00001 diff --git a/src/graphics/terrain_cl.png.import b/src/graphics/terrain_cl.png.import new file mode 100644 index 0000000..a52d11b --- /dev/null +++ b/src/graphics/terrain_cl.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/terrain_cl.png-d78bff616c0deecb3dc6c30085d2553c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/terrain_cl.png" +dest_files=[ "res://.import/terrain_cl.png-d78bff616c0deecb3dc6c30085d2553c.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/src/graphics/terrian.tres b/src/graphics/terrian.tres new file mode 100644 index 0000000..8598779 --- /dev/null +++ b/src/graphics/terrian.tres @@ -0,0 +1,24 @@ +[gd_resource type="TileSet" load_steps=2 format=2] + +[ext_resource path="res://graphics/terrain_cl.png" type="Texture" id=1] + +[resource] +0/name = "terrain_cl.png 0" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 16, 288 ) +0/tile_mode = 1 +0/autotile/bitmask_mode = 1 +0/autotile/bitmask_flags = [ Vector2( 0, 0 ), 511, Vector2( 0, 1 ), 7, Vector2( 0, 2 ), 7, Vector2( 0, 3 ), 311, Vector2( 0, 4 ), 311, Vector2( 0, 5 ), 292, Vector2( 0, 6 ), 292, Vector2( 0, 7 ), 484, Vector2( 0, 8 ), 500, Vector2( 0, 9 ), 448, Vector2( 0, 10 ), 448, Vector2( 0, 11 ), 457, Vector2( 0, 12 ), 457, Vector2( 0, 13 ), 73, Vector2( 0, 14 ), 73, Vector2( 0, 15 ), 79, Vector2( 0, 16 ), 79 ] +0/autotile/icon_coordinate = Vector2( 0, 0 ) +0/autotile/tile_size = Vector2( 16, 16 ) +0/autotile/spacing = 0 +0/autotile/occluder_map = [ ] +0/autotile/navpoly_map = [ ] +0/autotile/priority_map = [ ] +0/autotile/z_index_map = [ ] +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shapes = [ ] +0/z_index = 0 diff --git a/src/project.godot b/src/project.godot index 28c8094..863a2bc 100644 --- a/src/project.godot +++ b/src/project.godot @@ -15,7 +15,8 @@ _global_script_class_icons={ [application] -config/name="CityLimits" +config/name="City Limits" +run/main_scene="res://world.tscn" config/icon="res://icon.png" [rendering] diff --git a/src/world.gd b/src/world.gd new file mode 100644 index 0000000..1df6b57 --- /dev/null +++ b/src/world.gd @@ -0,0 +1,25 @@ +extends Node2D + +var noise : OpenSimplexNoise +var map_size = Vector2(80, 60) +var grass_cap = 0.5 +var road_caps = Vector2(0.3, 0.05) + +func _ready(): + randomize() + noise = OpenSimplexNoise.new() + noise.seed = randi() + noise.octaves = 1.5 + noise.period = 12 + + make_terrian_map() + + +func make_terrian_map(): + for x in map_size.x: + for y in map_size.y: + var a = noise.get_noise_2d(x, y) + if a < grass_cap: + $Terrian.set_cell(x, y, 0) + + $Terrian.update_bitmask_region(Vector2(0.0, 0.0), Vector2(map_size.x, map_size.y)) \ No newline at end of file diff --git a/src/world.tscn b/src/world.tscn index 81a3f05..e0f19dc 100644 --- a/src/world.tscn +++ b/src/world.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] -[ext_resource path="res://graphics/roads.tres" type="TileSet" id=1] +[ext_resource path="res://world.gd" type="Script" id=1] +[ext_resource path="res://graphics/terrian.tres" type="TileSet" id=2] [node name="Node2D" type="Node2D"] +script = ExtResource( 1 ) -[node name="Roads" type="TileMap" parent="."] -tile_set = ExtResource( 1 ) +[node name="Terrian" type="TileMap" parent="."] +tile_set = ExtResource( 2 ) cell_size = Vector2( 16, 16 ) format = 1 diff --git a/src/world_gen.gd b/src/world_gen.gd deleted file mode 100644 index 427b09e..0000000 --- a/src/world_gen.gd +++ /dev/null @@ -1,36 +0,0 @@ -extends Node2D - -var noise : OpenSimplexNoise -var map_size = Vector2(80, 60) -var grass_cap = 0.5 -var road_caps = Vector2(0.3, 0.05) - -func _ready(): - randomize() - noise = OpenSimplexNoise.new() - noise.seed = randi() - noise.octaves = 1.5 - noise.period = 12 - - make_grass_map() - make_road_map() - - -func make_grass_map(): - for x in map_size.x: - for y in map_size.y: - var a = noise.get_noise_2d(x, y) - if a < grass_cap: - $Grass.set_cell(x, y, 0) - - $Grass.update_bitmask_region(Vector2(0.0, 0.0), Vector2(map_size.x, map_size.y)) - - -func make_road_map(): - for x in map_size.x: - for y in map_size.y: - var a = noise.get_noise_2d(x, y) - if a < road_caps.x and a > road_caps.y: - $Roads.set_cell(x, y, 0) - - $Roads.update_bitmask_region(Vector2(0.0, 0.0), Vector2(map_size.x, map_size.y))