Edit README.md

README.md

@@ -1,2 +1,16 @@
-see [Releases](https://git.sechat.de/jonas/retromariogodot/-/releases)<br/>
+see [Releases](https://gitlab.com/brausjonas/retromariogodot/-/releases)<br/>
-https://mariomaker32.itch.io/mario-bros-retro - pwd: 1234
+https://mariomaker32.itch.io/mario-bros-retro - pwd: 1234
+
+<br/>
+
+xcodebuild -scheme "namedesprojekts" -destination "generic/platform=iOS" CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" -archivePath "DeinArchivName.xcarchive" build
+<br/>
+dann build durch "archive" ersetzen - beim build kein archive angeben
+<br/>
+mkdir Payload
+<br/>
+Im xcarchive (Products/Applications):
+<br/>
+mv ../../../Payload
+<br/>
+zip -qq -r -9 FlutterIpaExport.ipa Payload

assets/Dead.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bkrv87t2ryjd0"
+path="res://.godot/imported/Dead.png-29ce68f874dbc43f4f9778a714b32623.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Dead.png"
+dest_files=["res://.godot/imported/Dead.png-29ce68f874dbc43f4f9778a714b32623.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

assets/Flag.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dgyuh7qglc7vd"
+path="res://.godot/imported/Flag.png-47653dcbce6ad9726dae00766f6d8d5d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Flag.png"
+dest_files=["res://.godot/imported/Flag.png-47653dcbce6ad9726dae00766f6d8d5d.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

assets/screenshots/1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bwrwij2s8csyn"
+path="res://.godot/imported/1.png-ab0c3ae98db1c6648eb7fb8190d73dd9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/screenshots/1.png"
+dest_files=["res://.godot/imported/1.png-ab0c3ae98db1c6648eb7fb8190d73dd9.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

export_presets.cfg

@@ -446,3 +446,77 @@ 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.5]
+
+name="iOS"
+platform="iOS"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="../../../../../home/jonas/Schreibtisch/Export_IOS/retromario.ipa"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.5.options]
+
+custom_template/debug=""
+custom_template/release=""
+architectures/arm64=true
+application/app_store_team_id="12345"
+application/code_sign_identity_debug=""
+application/export_method_debug=1
+application/code_sign_identity_release=""
+application/export_method_release=1
+application/targeted_device_family=2
+application/bundle_identifier="com.retro.mario"
+application/signature=""
+application/short_version=""
+application/version=""
+application/icon_interpolation=4
+application/launch_screens_interpolation=4
+application/export_project_only=false
+capabilities/access_wifi=false
+capabilities/push_notifications=false
+user_data/accessible_from_files_app=false
+user_data/accessible_from_itunes_sharing=false
+privacy/camera_usage_description=""
+privacy/camera_usage_description_localized={}
+privacy/microphone_usage_description=""
+privacy/microphone_usage_description_localized={}
+privacy/photolibrary_usage_description=""
+privacy/photolibrary_usage_description_localized={}
+icons/iphone_120x120=""
+icons/iphone_180x180=""
+icons/ipad_76x76=""
+icons/ipad_152x152=""
+icons/ipad_167x167=""
+icons/app_store_1024x1024=""
+icons/spotlight_40x40=""
+icons/spotlight_80x80=""
+icons/settings_58x58=""
+icons/settings_87x87=""
+icons/notification_40x40=""
+icons/notification_60x60=""
+storyboard/use_launch_screen_storyboard=true
+storyboard/image_scale_mode=0
+storyboard/custom_image@2x=""
+storyboard/custom_image@3x=""
+storyboard/use_custom_bg_color=false
+storyboard/custom_bg_color=Color(0, 0, 0, 1)
+landscape_launch_screens/iphone_2436x1125=""
+landscape_launch_screens/iphone_2208x1242=""
+landscape_launch_screens/ipad_1024x768=""
+landscape_launch_screens/ipad_2048x1536=""
+portrait_launch_screens/iphone_640x960=""
+portrait_launch_screens/iphone_640x1136=""
+portrait_launch_screens/iphone_750x1334=""
+portrait_launch_screens/iphone_1125x2436=""
+portrait_launch_screens/ipad_768x1024=""
+portrait_launch_screens/ipad_1536x2048=""
+portrait_launch_screens/iphone_1242x2208=""

project.godot

@@ -22,6 +22,10 @@ config/icon="res://assets/icon.png"
 window/stretch/mode="viewport"
 window/vsync/vsync_mode=0
 
+[dotnet]
+
+project/assembly_name="RetroMario"
+
 [global]
 
 itch=false

scenes/enemies/plant.tscn

@@ -28,6 +28,9 @@ animations = [{
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_mdpkr"]
 size = Vector2(16, 24)
 
+[sub_resource type="Animation" id="Animation_axvvr"]
+length = 0.001
+
 [sub_resource type="Animation" id="Animation_g0wcr"]
 resource_name = "default"
 length = 8.0
@@ -50,9 +53,6 @@ tracks/0/keys = {
 }]
 }
 
-[sub_resource type="Animation" id="Animation_axvvr"]
-length = 0.001
-
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_x0mu6"]
 _data = {
 "RESET": SubResource("Animation_axvvr"),

scenes/levels/level_0.tscn

@@ -1,7 +1,9 @@
-[gd_scene load_steps=3 format=3 uid="uid://drbqiko4xx71d"]
+[gd_scene load_steps=5 format=3 uid="uid://drbqiko4xx71d"]
 
 [ext_resource type="Script" path="res://scripts/LevelSelect.gd" id="1_ck5bd"]
 [ext_resource type="FontFile" uid="uid://cpwx7datjer6s" path="res://assets/PixelOperator8.ttf" id="2_3ebbo"]
+[ext_resource type="Texture2D" uid="uid://dgyuh7qglc7vd" path="res://assets/Flag.png" id="3_v04a0"]
+[ext_resource type="Texture2D" uid="uid://bkrv87t2ryjd0" path="res://assets/Dead.png" id="4_3d18b"]
 
 [node name="LevelSelect" type="CanvasLayer"]
 script = ExtResource("1_ck5bd")
@@ -21,16 +23,18 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = -240.0
+offset_left = -336.0
-offset_top = -148.0
+offset_top = -100.0
-offset_right = -32.0
+offset_right = -192.0
-offset_bottom = -84.0
+offset_bottom = -36.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_fonts/font = ExtResource("2_3ebbo")
 theme_override_font_sizes/font_size = 24
 disabled = true
-text = "Level 1"
+text = "1-1"
+icon = ExtResource("3_v04a0")
+expand_icon = true
 
 [node name="Button_2" type="Button" parent="Control"]
 layout_mode = 1
@@ -39,16 +43,18 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = 32.0
+offset_left = -160.0
-offset_top = -148.0
+offset_top = -100.0
-offset_right = 240.0
+offset_right = -16.0
-offset_bottom = -84.0
+offset_bottom = -36.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_fonts/font = ExtResource("2_3ebbo")
 theme_override_font_sizes/font_size = 24
 disabled = true
-text = "Level 2"
+text = "1-2"
+icon = ExtResource("3_v04a0")
+expand_icon = true
 
 [node name="Button_3" type="Button" parent="Control"]
 layout_mode = 1
@@ -57,16 +63,18 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = -240.0
+offset_left = 16.0
-offset_top = -36.0
+offset_top = -100.0
-offset_right = -32.0
+offset_right = 160.0
-offset_bottom = 28.0
+offset_bottom = -36.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_fonts/font = ExtResource("2_3ebbo")
 theme_override_font_sizes/font_size = 24
 disabled = true
-text = "Level 3"
+text = "1-3"
+icon = ExtResource("3_v04a0")
+expand_icon = true
 
 [node name="Button_4" type="Button" parent="Control"]
 layout_mode = 1
@@ -75,16 +83,18 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = 32.0
+offset_left = 192.0
-offset_top = -36.0
+offset_top = -100.0
-offset_right = 240.0
+offset_right = 336.0
-offset_bottom = 28.0
+offset_bottom = -36.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_fonts/font = ExtResource("2_3ebbo")
 theme_override_font_sizes/font_size = 24
 disabled = true
-text = "Level 4"
+text = "1-4"
+icon = ExtResource("4_3d18b")
+expand_icon = true
 
 [node name="Button_5" type="Button" parent="Control"]
 layout_mode = 1
@@ -93,16 +103,18 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = -240.0
+offset_left = -336.0
-offset_top = 76.0
+offset_top = -4.0
-offset_right = -32.0
+offset_right = -192.0
-offset_bottom = 140.0
+offset_bottom = 60.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_fonts/font = ExtResource("2_3ebbo")
 theme_override_font_sizes/font_size = 24
 disabled = true
-text = "Level 5"
+text = "2-1"
+icon = ExtResource("3_v04a0")
+expand_icon = true
 
 [connection signal="pressed" from="Control/Button_1" to="." method="_on_button_pressed" binds= ["1"]]
 [connection signal="pressed" from="Control/Button_2" to="." method="_on_button_pressed" binds= ["2"]]

scenes/levels/level_1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=21 format=3 uid="uid://dv50be68omp73"]
+[gd_scene load_steps=20 format=3 uid="uid://dv50be68omp73"]
 
 [ext_resource type="Texture2D" uid="uid://chrld8oybp4me" path="res://assets/bg-1-1.png" id="1_p04bh"]
 [ext_resource type="PackedScene" uid="uid://dk1aby88pygtr" path="res://scenes/player.tscn" id="2_j2a2f"]
@@ -11,7 +11,6 @@
 [ext_resource type="PackedScene" uid="uid://be832pldgbeyk" path="res://scenes/pipe.tscn" id="9_sfjeq"]
 [ext_resource type="AudioStream" uid="uid://cdtrw675os7dh" path="res://assets/sounds/01. Ground Theme.mp3" id="10_n5jvu"]
 [ext_resource type="FontFile" uid="uid://cpwx7datjer6s" path="res://assets/PixelOperator8.ttf" id="11_1j7cv"]
-[ext_resource type="Script" path="res://scripts/Label_Platform.gd" id="12_uc2k2"]
 [ext_resource type="Script" path="res://scripts/WorldBoundDown.gd" id="13_je7o8"]
 [ext_resource type="PackedScene" uid="uid://bm04qp5vgbi10" path="res://scenes/flag.tscn" id="14_ry537"]
 [ext_resource type="PackedScene" uid="uid://dflvi18e358ek" path="res://scenes/blocks/enimie_barrier.tscn" id="15_ac2kk"]
@@ -19367,7 +19366,7 @@ position = Vector2(2048, 0)
 
 [node name="pipe" parent="Pipes" instance=ExtResource("9_sfjeq")]
 position = Vector2(832, -64)
-target = Vector2(640, 112)
+target = Vector2(640, 192)
 
 [node name="pipe2" parent="Pipes" instance=ExtResource("9_sfjeq")]
 position = Vector2(816, 240)
@@ -19380,40 +19379,6 @@ stream = ExtResource("10_n5jvu")
 volume_db = -5.0
 autoplay = true
 
-[node name="Label" type="Label" parent="."]
-offset_left = -136.0
-offset_top = -111.0
-offset_right = 98.0
-offset_bottom = -88.0
-theme_override_colors/font_color = Color(0.25332, 0.473895, 1, 1)
-theme_override_fonts/font = ExtResource("11_1j7cv")
-text = "Swipe Left To Move"
-horizontal_alignment = 1
-vertical_alignment = 1
-script = ExtResource("12_uc2k2")
-
-[node name="Label2" type="Label" parent="."]
-offset_left = -151.0
-offset_top = -87.0
-offset_right = 105.0
-offset_bottom = -64.0
-theme_override_colors/font_color = Color(0.25332, 0.473895, 1, 1)
-theme_override_fonts/font = ExtResource("11_1j7cv")
-text = "Right Down Tap Jump"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Label3" type="Label" parent="."]
-offset_left = 1048.0
-offset_top = -98.0
-offset_right = 1304.0
-offset_bottom = -75.0
-theme_override_colors/font_color = Color(0.25332, 0.473895, 1, 1)
-theme_override_fonts/font = ExtResource("11_1j7cv")
-text = "Right Up Tap Fire"
-horizontal_alignment = 1
-vertical_alignment = 1
-
 [node name="WorldBoundDown" type="Area2D" parent="."]
 collision_layer = 32768
 collision_mask = 2
@@ -19471,7 +19436,6 @@ zoom = Vector2(3, 3)
 limit_left = -160
 limit_top = -184
 limit_bottom = 32
-position_smoothing_enabled = true
 position_smoothing_speed = 10.0
 
 [node name="ColorRect" type="ColorRect" parent="Camera2D"]

scenes/levels/level_2.tscn

@@ -45755,7 +45755,7 @@ position = Vector2(1296, 176)
 
 [node name="pipe" parent="pipes" instance=ExtResource("10_aqfih")]
 position = Vector2(1472, -48)
-target = Vector2(1264, 64)
+target = Vector2(1264, 192)
 
 [node name="pipe2" parent="pipes" instance=ExtResource("10_aqfih")]
 position = Vector2(1440, 240)
@@ -45858,7 +45858,6 @@ zoom = Vector2(3, 3)
 limit_left = -160
 limit_top = -184
 limit_bottom = 32
-position_smoothing_enabled = true
 position_smoothing_speed = 10.0
 
 [node name="ColorRect" type="ColorRect" parent="Camera2D"]

scenes/levels/level_3.tscn

@@ -7888,7 +7888,6 @@ zoom = Vector2(3, 3)
 limit_left = -160
 limit_top = -184
 limit_bottom = 32
-position_smoothing_enabled = true
 position_smoothing_speed = 10.0
 
 [node name="ColorRect" type="ColorRect" parent="Camera2D"]

scenes/levels/level_4.tscn

@@ -7466,7 +7466,6 @@ zoom = Vector2(3, 3)
 limit_left = -160
 limit_top = -184
 limit_bottom = 32
-position_smoothing_enabled = true
 position_smoothing_speed = 10.0
 
 [node name="ColorRect" type="ColorRect" parent="Camera2D"]

scripts/Label_Platform.gd

@@ -1,20 +0,0 @@
-extends Label
-@onready var label = $"."
-@onready var label_2 = $"../Label2"
-@onready var label_3 = $"../Label3"
-
-
-func _ready():
-	var platform = ""
-	
-	match OS.get_name():
-		"Windows", "macOS", "Linux", "FreeBSD", "NetBSD", "OpenBSD", "BSD":
-			label.text = "A, S, D To Move"
-			label_2.text = "Space To Jump"
-			label_3.text = "E To Fire"
-		"Web":
-			label.text = "Swipe Left/W, S, A, D"
-			label_2.text = "Right Down Tap/Space"
-			label_3.text = "Right Up Tap/E"
-		"Android", "iOS":
-			pass

scripts/enemies/plant.gd

@@ -16,9 +16,9 @@ func _on_body_entered(body):
 		
 func _process(delta):
 	if mover < 25:
-		collision_shape_2d.position.y += -1 if up else 1
+		collision_shape_2d.position.y += -25 * delta if up else 25 * delta
-		animated_sprite_2d.position.y += -1 if up else 1
+		animated_sprite_2d.position.y += -25 * delta if up else 25 * delta
-		mover += 1
+		mover += 25 * delta
 
 func _on_timer_timeout():
 	innocent = false

scripts/player.gd

@@ -72,11 +72,16 @@ func _ready():
 	pipedetector_ground.position.y = 0
 	collision_shape_2d.shape.height = 15
 
+var camera_target_pos_y = 0
+
 func _process(delta):
 	camera_2d.position.x = position.x + 50
 	
-	if is_on_floor() or velocity.y > 0 and camera_2d.position.y < position.y:
+	if is_on_floor() or velocity.y > 0 and camera_target_pos_y < position.y:
-		camera_2d.position.y = position.y if not is_big else position.y + 8
+		camera_target_pos_y = position.y if not is_big else position.y + 8
+	
+	if camera_target_pos_y != camera_2d.position.y:
+		camera_2d.position.y += (camera_target_pos_y - camera_2d.position.y) * 10 * delta
 	
 	# set camera 
 	if position.y <= 32: