Putting Generated Map into PlayerMovement Scene For testing

Merge remote-tracking branch 'refs/remotes/origin/dev-base'
Conflicts: project.godot
2023-04-07 16:22:55 +02:00 · 2023-04-07 16:18:21 +02:00 · 2023-04-07 16:11:07 +02:00 · 2023-04-07 19:28:30 +05:30 · 2023-04-07 09:03:36 +00:00 · 2023-04-07 09:03:27 +00:00
7 changed files with 373 additions and 1 deletions
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@ -0,0 +1,99 @@
+name: "godot-ci export"
+on:
+  push:
+    branches:
+      - stable
+
+jobs:
+  export_game:
+    runs-on: ubuntu-latest
+    name: Export Game
+    steps:
+      - name: Checkout
+        uses: https://github.com/actions/checkout@v3.3.0
+      - name: Install Packages
+        id: wine_install
+        run: |
+          apt update -y && apt upgrade -y
+          apt install -y wine64 nodejs p7zip-full ca-certificates tree jq curl zip 
+          echo "WINE_PATH=$(which wine64)" >> $GITHUB_OUTPUT
+      - name: Download Godot build-libs
+        run: |
+          mkdir -p /root/.local/share/godot/
+          wget -nv https://github.com/godotengine/godot/releases/download/4.0.2-stable/Godot_v4.0.2-stable_linux.x86_64.zip -O "/root/.local/share/godot/godot.zip"
+          wget -nv https://github.com/godotengine/godot/releases/download/4.0.2-stable/Godot_v4.0.2-stable_export_templates.tpz -O /root/.local/share/godot/godot_templates.tpz
+      - name: Setup Godot build-libs
+        run: |
+          7z x /root/.local/share/godot/godot.zip -o/root/.local/share/godot/godot_executable -y
+          chmod +x /root/.local/share/godot/godot_executable/Godot_v4.0.2-stable_linux.x86_64
+          unzip /root/.local/share/godot/godot_templates.tpz -d /root/.local/share/godot
+          mv /root/.local/share/godot/templates /root/.local/share/godot/4.0.2.stable
+          mkdir -p /root/.local/share/godot/export_templates
+          mv /root/.local/share/godot/4.0.2.stable /root/.local/share/godot/export_templates
+          /root/.local/share/godot/godot_executable/Godot_v4.0.2-stable_linux.x86_64 --version
+      - name: Export for Web
+        run: |
+          mkdir -p ./builds/web/
+          /root/.local/share/godot/godot_executable/Godot_v4.0.2-stable_linux.x86_64 /var/lib/actions/project.godot -q --headless --export-release "Web" ./builds/web/Game.html
+      - name: Package for Web
+        run: |
+          cd builds
+          tar -czvf web.zip -C web/ .
+      - name: Export for Linux
+        run: |
+          mkdir -p ./builds/linux/
+          /root/.local/share/godot/godot_executable/Godot_v4.0.2-stable_linux.x86_64 /var/lib/actions/project.godot -q --headless --export-release "Linux/X11" ./builds/linux/Game.x86_64
+      - name: Package for Linux
+        run: |
+          cd builds
+          tar -czvf linux.tar.gz -C linux/ .
+      - name: Export for Windows
+        run: |
+          mkdir -p ./builds/windows/
+          /root/.local/share/godot/godot_executable/Godot_v4.0.2-stable_linux.x86_64 /var/lib/actions/project.godot -q --headless --export-release "Windows Desktop" ./builds/windows/Game.exe
+      - name: Package for Windows
+        run: |
+          cd builds
+          cd windows; zip -r ../windows.zip *
+          cd ..
+      - name: Create Release
+        run: |
+          echo "Getting last Release Tag"
+          VERSION=$(curl -X 'GET'   'https://git.euph.dev/api/v1/repos/${{ github.repository }}/releases?page=1&limit=1'   -H 'accept: application/json'   -H 'Authorization: token ${{ secrets.RELEASE_TOKEN }}' )
+          echo $VERSION | jq -r '.[0].tag_name'
+          VERSION=$(echo $VERSION | jq -r '.[0].tag_name' | awk -F. -v OFS=. '{$NF += 1 ; print}')
+          echo "Generate new Release with tag: $VERSION"
+          ID=$(curl -X 'POST' \
+          'https://git.euph.dev/api/v1/repos/${{ github.repository }}/releases' \
+          -H 'accept: application/json' \
+          -H 'Content-Type: application/json' \
+          -H 'Authorization: token ${{ secrets.RELEASE_TOKEN }}' \
+          -d "{
+            \"body\": \"Automated Build\",
+            \"draft\": true,
+            \"name\": \"Automated Release $VERSION\",
+            \"prerelease\": true,
+            \"tag_name\": \"$VERSION\"
+          }")
+          ID=$(echo $ID | jq -r '.id')
+          echo $ID Upload Web
+          curl -X 'POST' \
+          "https://git.euph.dev/api/v1/repos/${{ github.repository }}/releases/$ID/assets?name=Web.zip" \
+          -H 'accept: application/json' \
+          -H 'Content-Type: multipart/form-data' \
+          -H 'Authorization: token ${{ secrets.RELEASE_TOKEN }}' \
+          -F 'attachment=@./builds/web.zip;type=application/gzip'
+          echo $ID Upload Linux
+          curl -X 'POST' \
+          "https://git.euph.dev/api/v1/repos/${{ github.repository }}/releases/$ID/assets?name=Linux.tar.gz" \
+          -H 'accept: application/json' \
+          -H 'Content-Type: multipart/form-data' \
+          -H 'Authorization: token ${{ secrets.RELEASE_TOKEN }}' \
+          -F 'attachment=@./builds/linux.tar.gz;type=application/gzip'
+          echo $ID Upload Windows
+          curl -X 'POST' \
+          "https://git.euph.dev/api/v1/repos/${{ github.repository }}/releases/$ID/assets?name=Windows.zip" \
+          -H 'accept: application/json' \
+          -H 'Content-Type: multipart/form-data' \
+          -H 'Authorization: token ${{ secrets.RELEASE_TOKEN }}' \
+          -F 'attachment=@./builds/windows.zip;type=application/gzip'
--- a/Assets/Sprites/Jesus_Left_Idle.png
+++ b/Assets/Sprites/Jesus_Left_Idle.png
--- a/Assets/Sprites/Jesus_Left_Idle.png.import
+++ b/Assets/Sprites/Jesus_Left_Idle.png.import
@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c6n0go8l4gaak"
+path="res://.godot/imported/Jesus_Left_Idle.png-591d029c8d8b8b573a2665b70cf0e031.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Jesus_Left_Idle.png"
+dest_files=["res://.godot/imported/Jesus_Left_Idle.png-591d029c8d8b8b573a2665b70cf0e031.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/Scenes/PlayerMovement.tscn
+++ b/Scenes/PlayerMovement.tscn
@ -0,0 +1,35 @@
+[gd_scene load_steps=5 format=3 uid="uid://ccgpsim5nfxd6"]
+
+[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="1_x3102"]
+[ext_resource type="Texture2D" uid="uid://c6n0go8l4gaak" path="res://Assets/Sprites/Jesus_Left_Idle.png" id="2_48vut"]
+[ext_resource type="TileSet" uid="uid://b7cqbf6xdbeal" path="res://Assets/Test_Tileset.tres" id="3_0at2g"]
+[ext_resource type="Script" path="res://Scripts/MapGenerator.gd" id="4_8st0q"]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="TileMap" type="TileMap" parent="."]
+tile_set = ExtResource("3_0at2g")
+cell_quadrant_size = 8
+collision_visibility_mode = 1
+format = 2
+script = ExtResource("4_8st0q")
+
+[node name="CharacterBody2D" type="CharacterBody2D" parent="."]
+position = Vector2(512, 300)
+scale = Vector2(0.25, 0.25)
+script = ExtResource("1_x3102")
+speed = 80
+
+[node name="Sprite2D" type="Sprite2D" parent="CharacterBody2D"]
+texture = ExtResource("2_48vut")
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="CharacterBody2D"]
+polygon = PackedVector2Array(16, 32, -14, 32, -14, -22, 16, -22)
+
+[node name="Camera2D" type="Camera2D" parent="CharacterBody2D"]
+zoom = Vector2(10, 10)
+position_smoothing_enabled = true
+drag_horizontal_enabled = true
+drag_vertical_enabled = true
+editor_draw_limits = true
+editor_draw_drag_margin = true
--- a/Scripts/PlayerController.gd
+++ b/Scripts/PlayerController.gd
@ -0,0 +1,24 @@
+extends CharacterBody2D
+
+@export var speed = 100
+@export_range(0, 1) var damping_factor := 0.6
+
+func get_move_vector():
+	var input_direction = Input.get_vector("move_left", "move_right", "move_up", "move_down").normalized()
+	return input_direction
+
+func move_player(delta : float):
+	if get_move_vector() == Vector2.ZERO:
+		# Damp Players Velocity if no Input
+		self.velocity = self.velocity * (1 - min(1, damping_factor * 60 * delta)) 
+	else:
+		# Set Players Velocity to the Input Direction in the Players Speed
+		self.velocity = get_move_vector() * speed * delta * 60
+		
+	# Update The Players Physics Calculations
+	self.move_and_slide()
+	pass
+
+func _physics_process(delta : float):
+	move_player(delta)
+	pass
--- a/export_presets.cfg
+++ b/export_presets.cfg
@ -0,0 +1,145 @@
+[preset.0]
+
+name="Web"
+platform="Web"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="../../Downloads/HoppyEaster.html"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+script_encryption_key=""
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+variant/extensions_support=false
+vram_texture_compression/for_desktop=true
+vram_texture_compression/for_mobile=false
+html/export_icon=true
+html/custom_html_shell=""
+html/head_include=""
+html/canvas_resize_policy=2
+html/focus_canvas_on_start=true
+html/experimental_virtual_keyboard=false
+progressive_web_app/enabled=false
+progressive_web_app/offline_page=""
+progressive_web_app/display=1
+progressive_web_app/orientation=0
+progressive_web_app/icon_144x144=""
+progressive_web_app/icon_180x180=""
+progressive_web_app/icon_512x512=""
+progressive_web_app/background_color=Color(0, 0, 0, 1)
+
+[preset.1]
+
+name="Linux/X11"
+platform="Linux/X11"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+script_encryption_key=""
+
+[preset.1.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_script=1
+binary_format/embed_pck=false
+texture_format/bptc=true
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+binary_format/architecture="x86_64"
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="#!/usr/bin/env bash
+export DISPLAY=:0
+unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
+\"{temp_dir}/{exe_name}\" {cmd_args}"
+ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
+kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
+rm -rf \"{temp_dir}\""
+
+[preset.2]
+
+name="Windows Desktop"
+platform="Windows Desktop"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+script_encryption_key=""
+
+[preset.2.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_script=1
+binary_format/embed_pck=false
+texture_format/bptc=true
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+binary_format/architecture="x86_64"
+codesign/enable=false
+codesign/identity_type=0
+codesign/identity=""
+codesign/password=""
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PackedStringArray()
+application/modify_resources=true
+application/icon=""
+application/console_wrapper_icon=""
+application/icon_interpolation=4
+application/file_version=""
+application/product_version=""
+application/company_name=""
+application/product_name=""
+application/file_description=""
+application/copyright=""
+application/trademarks=""
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
+$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
+$trigger = New-ScheduledTaskTrigger -Once -At 00:00
+$settings = New-ScheduledTaskSettingsSet
+$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
+Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
+Start-ScheduledTask -TaskName godot_remote_debug
+while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
+ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
+Remove-Item -Recurse -Force '{temp_dir}'"
--- a/project.godot
+++ b/project.godot
@ -11,10 +11,45 @@ config_version=5
 [application]

 config/name="HoppyEaster"
-run/main_scene="res://Scenes/Test.tscn"
+run/main_scene="res://Scenes/Movement.tscn"
 config/features=PackedStringArray("4.0", "GL Compatibility")
 config/icon="res://icon.svg"

+[dotnet]
+
+project/assembly_name="HoppyEaster"
+
+[input]
+
+move_left={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null)
+]
+}
+move_right={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null)
+]
+}
+move_up={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null)
+]
+}
+move_down={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null)
+]
+}
+
 [layer_names]

 2d_physics/layer_1="Map"
Author	SHA1	Message	Date
Snoweuph	537589e30b	Putting Generated Map into PlayerMovement Scene For testing	2023-04-07 16:22:55 +02:00
Snoweuph	5a625f1792	Merge remote-tracking branch 'refs/remotes/origin/dev-base' Conflicts: project.godot	2023-04-07 16:18:21 +02:00
Snoweuph	ef60fdd59f	Fixing Strucuter and Cleaning Up	2023-04-07 16:11:07 +02:00
AXVIII3	4b2d83a4c5	Basic Movement	2023-04-07 19:28:30 +05:30
Snoweuph	ebc7a8ec62	Merge pull request 'Fix Typo in Build Workflow' (#4 ) from snoweuph-patch-1 into stable All checks were successful Export Game Details Reviewed-on: #4	2023-04-07 09:03:36 +00:00
Snoweuph	0732748e7e	Fix Typo in Build Workflow	2023-04-07 09:03:27 +00:00
Snoweuph	3ae1886caf	Merge pull request 'Fix Typo in Build Workflow' (#3 ) from snoweuph-patch-1 into stable Some checks failed Export Game Details Reviewed-on: #3	2023-04-07 08:59:23 +00:00
Snoweuph	4f53918fdf	Fix Typo in Build Workflow	2023-04-07 08:59:09 +00:00
Snoweuph	1b6ac9984d	Merge pull request 'Import Basic Scene for Compiling' (#2 ) from dev-base into stable Some checks failed Export Game Details Reviewed-on: #2	2023-04-07 08:55:57 +00:00
Snoweuph	a94e4b7b1f	Update export_presets.cfg Some checks failed Export Game Details	2023-04-06 22:44:16 +02:00
Snoweuph	de347c7147	Add Web Build Some checks are pending Export Game Details	2023-04-06 22:43:48 +02:00
Snoweuph	ff0ccb9975	add build workflow	2023-04-06 22:36:54 +02:00