Переглянути джерело

coding feels bad, having a hard time doing it... Also may convert to Godot if i find the will again

volt 1 рік тому
батько
коміт
de6e4d1867

+ 1 - 1
getafeel.yyp

@@ -60,7 +60,7 @@
   "isEcma":false,
   "LibraryEmitters":[],
   "MetaData":{
-    "IDEVersion":"2024.8.1.171",
+    "IDEVersion":"2024.11.0.179",
   },
   "name":"getafeel",
   "resources":[

+ 2 - 2
objects/obj_fight_scn/Create_0.gml

@@ -7,6 +7,7 @@ enum STATE
 	ACTIVATE,
 	WAIT,
 	ATTACK,
+	MOBATTACK,
     TEST
 }
 
@@ -15,8 +16,6 @@ state = STATE.INIT;
 win_width = window_get_width();
 win_height = window_get_height();
 
-// Mobs to fight
-mobs_arr = [];
 
 // Cards in hand
 card_hand = [];
@@ -44,6 +43,7 @@ for(i=0; i<=4; i+=1;)
 }
 
 // Spawn Mobs
+mobs_arr = [];
 mobs_nb = irandom_range(1, 4);
 
 for (mob_i=0; mob_i<mobs_nb; mob_i++;)

+ 2 - 2
objects/obj_fight_scn/Step_0.gml

@@ -52,10 +52,10 @@ switch (state)
 	
 		mobs_arr[0].life -= _dmg;
 		
-		state = STATE.SELECT;
+		state = STATE.WAIT;
     break;
 
-    case 2:
+    case STATE.MOBATTACK:
         //
     break;
 

+ 2 - 0
objects/obj_player/Create_0.gml

@@ -10,8 +10,10 @@ y = room_height - (sprite_height/2.3);
 
 lifemax = 10
 magimax = 10
+xpmax = 10
 life = 10
 magi = 8
+xp = 0
 
 // Life and Magi bars dimensions
 _bar_w = 90;

+ 81 - 0
options/android/options_android.yy

@@ -0,0 +1,81 @@
+{
+  "$GMAndroidOptions":"",
+  "%Name":"Android",
+  "name":"Android",
+  "option_android_application_tag_inject":"",
+  "option_android_arch_arm64":true,
+  "option_android_arch_armv7":false,
+  "option_android_arch_x86_64":false,
+  "option_android_attribute_allow_backup":false,
+  "option_android_build_tools":"",
+  "option_android_compile_sdk":"",
+  "option_android_device_support":0,
+  "option_android_display_name":"Created with GameMaker",
+  "option_android_facebook_app_display_name":"",
+  "option_android_facebook_id":"",
+  "option_android_gamepad_support":true,
+  "option_android_google_apk_expansion":false,
+  "option_android_google_cloud_saving":false,
+  "option_android_google_dynamic_asset_delivery":false,
+  "option_android_google_licensing_public_key":"",
+  "option_android_google_services_app_id":"",
+  "option_android_icon_adaptivebg_hdpi":"${base_options_dir}/android/icons_adaptivebg/hdpi.png",
+  "option_android_icon_adaptivebg_ldpi":"${base_options_dir}/android/icons_adaptivebg/ldpi.png",
+  "option_android_icon_adaptivebg_mdpi":"${base_options_dir}/android/icons_adaptivebg/mdpi.png",
+  "option_android_icon_adaptivebg_xhdpi":"${base_options_dir}/android/icons_adaptivebg/xhdpi.png",
+  "option_android_icon_adaptivebg_xxhdpi":"${base_options_dir}/android/icons_adaptivebg/xxhdpi.png",
+  "option_android_icon_adaptivebg_xxxhdpi":"${base_options_dir}/android/icons_adaptivebg/xxxhdpi.png",
+  "option_android_icon_adaptive_generate":false,
+  "option_android_icon_adaptive_hdpi":"${base_options_dir}/android/icons_adaptive/hdpi.png",
+  "option_android_icon_adaptive_ldpi":"${base_options_dir}/android/icons_adaptive/ldpi.png",
+  "option_android_icon_adaptive_mdpi":"${base_options_dir}/android/icons_adaptive/mdpi.png",
+  "option_android_icon_adaptive_xhdpi":"${base_options_dir}/android/icons_adaptive/xhdpi.png",
+  "option_android_icon_adaptive_xxhdpi":"${base_options_dir}/android/icons_adaptive/xxhdpi.png",
+  "option_android_icon_adaptive_xxxhdpi":"${base_options_dir}/android/icons_adaptive/xxxhdpi.png",
+  "option_android_icon_hdpi":"${base_options_dir}/android/icons/hdpi.png",
+  "option_android_icon_ldpi":"${base_options_dir}/android/icons/ldpi.png",
+  "option_android_icon_mdpi":"${base_options_dir}/android/icons/mdpi.png",
+  "option_android_icon_xhdpi":"${base_options_dir}/android/icons/xhdpi.png",
+  "option_android_icon_xxhdpi":"${base_options_dir}/android/icons/xxhdpi.png",
+  "option_android_icon_xxxhdpi":"${base_options_dir}/android/icons/xxxhdpi.png",
+  "option_android_install_location":0,
+  "option_android_interpolate_pixels":false,
+  "option_android_launchscreen_fill":0,
+  "option_android_lint":false,
+  "option_android_logcat":"yoyo:V DEBUG:V AndroidRuntime:V",
+  "option_android_minimum_sdk":"",
+  "option_android_orient_landscape":true,
+  "option_android_orient_landscape_flipped":true,
+  "option_android_orient_portrait":true,
+  "option_android_orient_portrait_flipped":true,
+  "option_android_package_company":"company",
+  "option_android_package_domain":"com",
+  "option_android_package_product":"game",
+  "option_android_permission_bluetooth":true,
+  "option_android_permission_internet":true,
+  "option_android_permission_network_state":false,
+  "option_android_permission_read_phone_state":false,
+  "option_android_permission_record_audio":false,
+  "option_android_permission_write_external_storage":false,
+  "option_android_proguard_minifying":false,
+  "option_android_proguard_shrinking":false,
+  "option_android_scale":0,
+  "option_android_screen_depth":0,
+  "option_android_sleep_margin":4,
+  "option_android_splashscreen_background_colour":255,
+  "option_android_splash_screens_landscape":"${base_options_dir}/android/splash/landscape.png",
+  "option_android_splash_screens_portrait":"${base_options_dir}/android/splash/portrait.png",
+  "option_android_splash_time":0,
+  "option_android_support_lib":"",
+  "option_android_sync_amazon":false,
+  "option_android_target_sdk":"",
+  "option_android_texture_page":"2048x2048",
+  "option_android_tools_from_version":false,
+  "option_android_tv_banner":"${base_options_dir}/android/tv_banner.png",
+  "option_android_tv_isgame":true,
+  "option_android_tv_supports_leanback":true,
+  "option_android_use_facebook":false,
+  "option_android_version":"1.0.0.0",
+  "resourceType":"GMAndroidOptions",
+  "resourceVersion":"2.0",
+}

+ 35 - 0
options/html5/options_html5.yy

@@ -0,0 +1,35 @@
+{
+  "$GMHtml5Options":"",
+  "%Name":"HTML5",
+  "name":"HTML5",
+  "option_html5_allow_fullscreen":true,
+  "option_html5_browser_title":"Created with GameMaker",
+  "option_html5_centregame":false,
+  "option_html5_display_cursor":true,
+  "option_html5_facebook_app_display_name":"",
+  "option_html5_facebook_id":"",
+  "option_html5_flurry_enable":false,
+  "option_html5_flurry_id":"",
+  "option_html5_foldername":"html5game",
+  "option_html5_google_analytics_enable":false,
+  "option_html5_google_tracking_id":"",
+  "option_html5_icon":"${base_options_dir}/html5/fav.ico",
+  "option_html5_index":"",
+  "option_html5_interpolate_pixels":true,
+  "option_html5_jsprepend":"",
+  "option_html5_loadingbar":"",
+  "option_html5_localrunalert":true,
+  "option_html5_outputdebugtoconsole":true,
+  "option_html5_outputname":"index.html",
+  "option_html5_scale":0,
+  "option_html5_splash_png":"${base_options_dir}/html5/splash.png",
+  "option_html5_texture_page":"2048x2048",
+  "option_html5_usebuiltinfont":true,
+  "option_html5_usebuiltinparticles":true,
+  "option_html5_usesplash":false,
+  "option_html5_use_facebook":false,
+  "option_html5_version":"1.0.0.0",
+  "option_html5_webgl":2,
+  "resourceType":"GMHtml5Options",
+  "resourceVersion":"2.0",
+}

+ 49 - 0
options/ios/options_ios.yy

@@ -0,0 +1,49 @@
+{
+  "$GMiOSOptions":"v1",
+  "%Name":"iOS",
+  "name":"iOS",
+  "option_ios_build_number":0,
+  "option_ios_bundle_name":"com.company.game",
+  "option_ios_defer_home_indicator":false,
+  "option_ios_devices":2,
+  "option_ios_display_name":"Created with GameMaker",
+  "option_ios_enable_broadcast":false,
+  "option_ios_half_ipad1_textures":false,
+  "option_ios_icon_ipad_app_152":"${base_options_dir}/ios/icons/app/ipad_152.png",
+  "option_ios_icon_ipad_app_76":"${base_options_dir}/ios/icons/app/ipad_76.png",
+  "option_ios_icon_ipad_notification_20":"${base_options_dir}/ios/icons/notification/ipad_20.png",
+  "option_ios_icon_ipad_notification_40":"${base_options_dir}/ios/icons/notification/ipad_40.png",
+  "option_ios_icon_ipad_pro_app_167":"${base_options_dir}/ios/icons/app/ipad_pro_167.png",
+  "option_ios_icon_ipad_settings_29":"${base_options_dir}/ios/icons/settings/ipad_29.png",
+  "option_ios_icon_ipad_settings_58":"${base_options_dir}/ios/icons/settings/ipad_58.png",
+  "option_ios_icon_ipad_spotlight_40":"${base_options_dir}/ios/icons/spotlight/ipad_40.png",
+  "option_ios_icon_ipad_spotlight_80":"${base_options_dir}/ios/icons/spotlight/ipad_80.png",
+  "option_ios_icon_iphone_app_120":"${base_options_dir}/ios/icons/app/iphone_120.png",
+  "option_ios_icon_iphone_app_180":"${base_options_dir}/ios/icons/app/iphone_180.png",
+  "option_ios_icon_iphone_notification_40":"${base_options_dir}/ios/icons/notification/iphone_40.png",
+  "option_ios_icon_iphone_notification_60":"${base_options_dir}/ios/icons/notification/iphone_60.png",
+  "option_ios_icon_iphone_settings_58":"${base_options_dir}/ios/icons/settings/iphone_58.png",
+  "option_ios_icon_iphone_settings_87":"${base_options_dir}/ios/icons/settings/iphone_87.png",
+  "option_ios_icon_iphone_spotlight_120":"${base_options_dir}/ios/icons/spotlight/iphone_120.png",
+  "option_ios_icon_iphone_spotlight_80":"${base_options_dir}/ios/icons/spotlight/iphone_80.png",
+  "option_ios_icon_itunes_artwork_1024":"${base_options_dir}/ios/icons/itunes/itunes_1024.png",
+  "option_ios_interpolate_pixels":false,
+  "option_ios_launchscreen_fill":0,
+  "option_ios_launchscreen_image":"${base_options_dir}/ios/splash/launchscreen.png",
+  "option_ios_launchscreen_image_landscape":"${base_options_dir}/ios/splash/launchscreen-landscape.png",
+  "option_ios_min_version":"10.0",
+  "option_ios_orientation_landscape":true,
+  "option_ios_orientation_landscape_flipped":true,
+  "option_ios_orientation_portrait":true,
+  "option_ios_orientation_portrait_flipped":true,
+  "option_ios_output_dir":"~/gamemakerstudio2",
+  "option_ios_podfile_lock_path":"${options_dir}/ios/Podfile.lock",
+  "option_ios_podfile_path":"${options_dir}/ios/Podfile",
+  "option_ios_scale":0,
+  "option_ios_splashscreen_background_colour":255,
+  "option_ios_team_id":"",
+  "option_ios_texture_page":"2048x2048",
+  "option_ios_version":"1.0.0.0",
+  "resourceType":"GMiOSOptions",
+  "resourceVersion":"2.0",
+}

+ 26 - 0
options/linux/options_linux.yy

@@ -0,0 +1,26 @@
+{
+  "$GMLinuxOptions":"",
+  "%Name":"Linux",
+  "name":"Linux",
+  "option_linux_allow_fullscreen":false,
+  "option_linux_disable_sandbox":false,
+  "option_linux_display_cursor":true,
+  "option_linux_display_name":"Created with GameMaker",
+  "option_linux_display_splash":false,
+  "option_linux_enable_steam":false,
+  "option_linux_homepage":"http://www.yoyogames.com",
+  "option_linux_icon":"${base_options_dir}/linux/icons/64.png",
+  "option_linux_interpolate_pixels":true,
+  "option_linux_long_desc":"",
+  "option_linux_maintainer_email":"",
+  "option_linux_resize_window":false,
+  "option_linux_scale":0,
+  "option_linux_short_desc":"",
+  "option_linux_splash_screen":"${base_options_dir}/linux/splash/splash.png",
+  "option_linux_start_fullscreen":false,
+  "option_linux_sync":false,
+  "option_linux_texture_page":"2048x2048",
+  "option_linux_version":"1.0.0.0",
+  "resourceType":"GMLinuxOptions",
+  "resourceVersion":"2.0",
+}

+ 6 - 2
options/main/options_main.yy

@@ -1,7 +1,8 @@
 {
-  "$GMMainOptions":"v1",
+  "$GMMainOptions":"v3",
   "%Name":"Main",
   "name":"Main",
+  "option_audio_error_behaviour":true,
   "option_author":"",
   "option_collision_compatibility":false,
   "option_copy_on_write_enabled":false,
@@ -9,8 +10,11 @@
   "option_gameguid":"56957db3-61b8-4bcd-8cef-7aebbc026ccb",
   "option_gameid":"0",
   "option_game_speed":60,
+  "option_legacy_json_parsing":true,
+  "option_legacy_number_conversion":true,
+  "option_legacy_other_behaviour":true,
   "option_mips_for_3d_textures":false,
-  "option_remove_unused_assets":true,
+  "option_remove_unused_assets":false,
   "option_sci_usesci":false,
   "option_spine_licence":false,
   "option_steam_app_id":"0",

+ 31 - 0
options/tvos/options_tvos.yy

@@ -0,0 +1,31 @@
+{
+  "$GMtvOSOptions":"v1",
+  "%Name":"tvOS",
+  "name":"tvOS",
+  "option_tvos_build_number":0,
+  "option_tvos_bundle_name":"com.company.game",
+  "option_tvos_display_cursor":false,
+  "option_tvos_display_name":"Made in GameMaker",
+  "option_tvos_enable_broadcast":false,
+  "option_tvos_icon_1280":"${base_options_dir}/tvos/icons/1280.png",
+  "option_tvos_icon_400":"${base_options_dir}/tvos/icons/400.png",
+  "option_tvos_icon_400_2x":"${base_options_dir}/tvos/icons/400_2x.png",
+  "option_tvos_interpolate_pixels":true,
+  "option_tvos_min_version":"10.0",
+  "option_tvos_output_dir":"~/GameMakerStudio2/tvOS",
+  "option_tvos_podfile_lock_path":"${options_dir}\\tvos\\Podfile.lock",
+  "option_tvos_podfile_path":"${options_dir}\\tvos\\Podfile",
+  "option_tvos_scale":0,
+  "option_tvos_splashscreen":"${base_options_dir}/tvos/splash/splash.png",
+  "option_tvos_splashscreen_2x":"${base_options_dir}/tvos/splash/splash_2x.png",
+  "option_tvos_splash_time":0,
+  "option_tvos_team_id":"",
+  "option_tvos_texture_page":"2048x2048",
+  "option_tvos_topshelf":"${base_options_dir}/tvos/topshelf/topshelf.png",
+  "option_tvos_topshelf_2x":"${base_options_dir}/tvos/topshelf/topshelf_2x.png",
+  "option_tvos_topshelf_wide":"${base_options_dir}/tvos/topshelf/topshelf_wide.png",
+  "option_tvos_topshelf_wide_2x":"${base_options_dir}/tvos/topshelf/topshelf_wide_2x.png",
+  "option_tvos_version":"1.0.0.0",
+  "resourceType":"GMtvOSOptions",
+  "resourceVersion":"2.0",
+}

+ 0 - 0
options/windows/options_windows.yy