Merge remote-tracking branch 'origin/update0219'

ddmyx.yyp

@@ -119,6 +119,7 @@
     {"id":{"name":"sPlayerDodge","path":"sprites/sPlayerDodge/sPlayerDodge.yy",},},
     {"id":{"name":"sPlayerDodgeEnding","path":"sprites/sPlayerDodgeEnding/sPlayerDodgeEnding.yy",},},
     {"id":{"name":"sPlayerDodgeWait","path":"sprites/sPlayerDodgeWait/sPlayerDodgeWait.yy",},},
+    {"id":{"name":"sPlayerFocus","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},},
     {"id":{"name":"sPlayerHitstunAttacked","path":"sprites/sPlayerHitstunAttacked/sPlayerHitstunAttacked.yy",},},
     {"id":{"name":"sPlayerHitstunHazard","path":"sprites/sPlayerHitstunHazard/sPlayerHitstunHazard.yy",},},
     {"id":{"name":"sPlayerHyper","path":"sprites/sPlayerHyper/sPlayerHyper.yy",},},

objects/oInGameManager/Draw_64.gml

@@ -1,4 +1,4 @@
 draw_set_valign(fa_top);
-draw_text(0, 0, "playerHP: " + string(global.playerHP));
-draw_text(0, 48, "playerINK: " + string(global.playerINK));
+draw_text(0, 0, "playerHP: " + string(global.playerHP) + " / " + string(global.save_data.player.maxHP));
+draw_text(0, 48, "playerINK: " + string(global.playerINK) + " / " + string(global.save_data.player.maxINK));
 draw_text(0, 96, "playerCredit: " + string(global.save_data.player.Credit))

objects/oMain/Step_0.gml

@@ -7,6 +7,7 @@ _right     = ingame.kc(vk_right);
 _up        = ingame.kc(vk_up);
 _down      = ingame.kc(vk_down);
 _inventory = ingame.kcp("I");
+_focus = ingame.kcp("A");
 
 _return    = ingame.kcp(vk_escape); // for debugging
 
@@ -67,7 +68,7 @@ if _inventory
 	global.inventory = icl(oInventory);
 	autoreg_handle("inventory", "inventory", 10);
 }
-if _close
+else if _close
 {
 	with(global.inventory) instance_destroy();
 	autodel_handle("inventory");

objects/oParentPlayerHitbox/Step_0.gml

@@ -19,6 +19,9 @@ for (var i = 0; i < _num; i++)
 			if _inst.hitbox_type = "BLADE"
 				global.hitstop = 10;
 		if object_is_ancestor(_inst.object_index, oParentEnemy)
+		{
+			if global.playerINK < global.save_data.player.maxINK
+				global.playerINK += 1;
             with(_inst)
 			{
 				enemy_get_hit(other.damage, other.kb_factor_x, other.kb_factor_y);
@@ -27,6 +30,7 @@ for (var i = 0; i < _num; i++)
 				
 				part_particles_burst(global.blade_hit_effect, x, y, peBladeHitEffect)
 			}
+		}
 		ds_list_add(hit_list, _inst);
     }
 }

scripts/PlayerStates/PlayerStates.gml

@@ -40,6 +40,9 @@ function player_move_and_collide()
 }
 function player_status_update()
 {
+	global.playerHP = clamp(global.playerHP, 0, global.save_data.player.maxHP);
+	global.playerINK = clamp(global.playerINK, 0, global.save_data.player.maxINK);
+	
 	current_attacker = instance_place(x, y, oEnemyHitbox);
 	current_hazard = instance_place(x, y, oParentHazard);
 	current_door = instance_place(x, y, oDoor);
@@ -195,6 +198,14 @@ function player_check_death()
 		set_sprite(sPlayerDeath);
 	}
 }
+function player_check_focus()
+{
+	if oMain._focus && global.playerINK >= 9
+	{
+		set_sprite(sPlayerFocus);
+		state = state_focus;
+	}
+}
 
 function player_check_door()
 {
@@ -276,6 +287,13 @@ function player_check_attacked()
 	|| state == state_death
 	//|| (state == state_dodge && dodge_phase == "WAIT")
 		return;
+		
+	if state == state_focus
+	{
+		global.playerINK -= 9;
+		global.hitstop = 24;
+	}
+	else global.hitstop = 12;
 	
 	global.playerHP -= current_attacker.damage;
 	invincible_timer = 80;
@@ -284,7 +302,6 @@ function player_check_attacked()
     if _dir == 0
 		_dir = facing;
 	
-	global.hitstop = 12;
 	screen_shake(10);
 	
 	x_spd = _dir * 30;
@@ -386,7 +403,7 @@ function state_free()
 	player_check_dash();
 	player_check_jump();
 	player_check_attack();
-	player_check_death();
+	player_check_focus();
 }
 function state_dash()
 {
@@ -404,14 +421,13 @@ function state_dash()
     }
 	
 	//player_check_dodge();
-	player_check_death();
+	player_check_focus();
 }
 function state_attack()
 {
 	player_check_movement();
 	player_check_jump();
 	player_check_dash();
-	player_check_death();
 	
     y_spd += player_calc_gravity();
 	
@@ -462,6 +478,7 @@ function state_death()
 	if animation_end()
 	{
 		global.playerHP = global.save_data.player.maxHP;
+		global.playerINK = 0;
 		
 		state = state_locked;
 		locked_timer = 120;
@@ -473,6 +490,18 @@ function state_death()
 		}
 	}
 }
+function state_focus()
+{
+	x_spd = 0;
+	y_spd = 0;
+	if animation_end()
+	{
+		global.playerINK -= 9;
+		global.playerHP += 3;
+		global.playerHP = clamp(global.playerHP, 0, global.save_data.player.maxHP);
+		state = state_free;
+	}
+}
 
 /// @desc 返回基于玩家当前状态的重力值，注意不会自动赋值
 function player_calc_gravity()

scripts/SL/SL.gml

@@ -5,7 +5,7 @@ function get_default_save_data()
 		player:
 		{
 			maxHP: 5,
-			maxINK: 100,
+			maxINK: 9,
 			Credit: 0,
 			
 			abilities:

sprites/sPlayerFocus/sPlayerFocus.yy

@@ -0,0 +1,146 @@
+{
+  "$GMSprite":"v2",
+  "%Name":"sPlayerFocus",
+  "bboxMode":1,
+  "bbox_bottom":127,
+  "bbox_left":0,
+  "bbox_right":71,
+  "bbox_top":0,
+  "collisionKind":1,
+  "collisionTolerance":0,
+  "DynamicTexturePage":false,
+  "edgeFiltering":false,
+  "For3D":false,
+  "frames":[
+    {"$GMSpriteFrame":"v1","%Name":"c5d44fa5-d96c-487d-bddf-77cad6272ecf","name":"c5d44fa5-d96c-487d-bddf-77cad6272ecf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"c13c3aa8-cfa7-44db-8808-f1d4a448fc41","name":"c13c3aa8-cfa7-44db-8808-f1d4a448fc41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"2c23944c-aec4-4384-ae56-bcb5d5054429","name":"2c23944c-aec4-4384-ae56-bcb5d5054429","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"aad3a77b-5f07-4a2f-8b97-3c6c625072f0","name":"aad3a77b-5f07-4a2f-8b97-3c6c625072f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"aa4297c7-4744-4b2b-88b9-d9241f102cba","name":"aa4297c7-4744-4b2b-88b9-d9241f102cba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"1f35ea38-ff95-41e1-9957-f848343bcb44","name":"1f35ea38-ff95-41e1-9957-f848343bcb44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"c3a5edae-6658-4a95-bc06-7e7f19eced08","name":"c3a5edae-6658-4a95-bc06-7e7f19eced08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"be6ece33-3b72-476c-8eaf-d6bb5d4575b3","name":"be6ece33-3b72-476c-8eaf-d6bb5d4575b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"b61db9a0-df4d-427b-bf24-6cc731506d33","name":"b61db9a0-df4d-427b-bf24-6cc731506d33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"3394bbc7-82d0-4e5d-a236-9c4e8bcc79b5","name":"3394bbc7-82d0-4e5d-a236-9c4e8bcc79b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"cda145ee-2907-4c9f-a808-96b0a4c4df0e","name":"cda145ee-2907-4c9f-a808-96b0a4c4df0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"72f5149d-1e45-4fcd-b0e5-91b00da6c9b4","name":"72f5149d-1e45-4fcd-b0e5-91b00da6c9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"d0e37413-bb00-48fd-aa74-37842ae04a70","name":"d0e37413-bb00-48fd-aa74-37842ae04a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"4bcd4533-69fe-4a79-90a8-c5657a887a46","name":"4bcd4533-69fe-4a79-90a8-c5657a887a46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+    {"$GMSpriteFrame":"v1","%Name":"8efdfcb4-637d-44c6-9028-a9ec4c30435c","name":"8efdfcb4-637d-44c6-9028-a9ec4c30435c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",},
+  ],
+  "gridX":0,
+  "gridY":0,
+  "height":128,
+  "HTile":false,
+  "layers":[
+    {"$GMImageLayer":"","%Name":"21d8bf7d-8959-4267-a6af-fcedb5d5d32f","blendMode":0,"displayName":"default","isLocked":false,"name":"21d8bf7d-8959-4267-a6af-fcedb5d5d32f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,},
+  ],
+  "name":"sPlayerFocus",
+  "nineSlice":null,
+  "origin":7,
+  "parent":{
+    "name":"Sprites",
+    "path":"folders/Player/Sprites.yy",
+  },
+  "preMultiplyAlpha":false,
+  "resourceType":"GMSprite",
+  "resourceVersion":"2.0",
+  "sequence":{
+    "$GMSequence":"v1",
+    "%Name":"sPlayerFocus",
+    "autoRecord":true,
+    "backdropHeight":768,
+    "backdropImageOpacity":0.5,
+    "backdropImagePath":"",
+    "backdropWidth":1366,
+    "backdropXOffset":0.0,
+    "backdropYOffset":0.0,
+    "events":{
+      "$KeyframeStore<MessageEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MessageEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "eventStubScript":null,
+    "eventToFunction":{},
+    "length":15.0,
+    "lockOrigin":false,
+    "moments":{
+      "$KeyframeStore<MomentsEventKeyframe>":"",
+      "Keyframes":[],
+      "resourceType":"KeyframeStore<MomentsEventKeyframe>",
+      "resourceVersion":"2.0",
+    },
+    "name":"sPlayerFocus",
+    "playback":1,
+    "playbackSpeed":60.0,
+    "playbackSpeedType":0,
+    "resourceType":"GMSequence",
+    "resourceVersion":"2.0",
+    "showBackdrop":true,
+    "showBackdropImage":false,
+    "timeUnits":1,
+    "tracks":[
+      {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore<SpriteFrameKeyframe>":"","Keyframes":[
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5d44fa5-d96c-487d-bddf-77cad6272ecf","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"54aef927-d91d-400b-b504-9ec17ad6b802","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c13c3aa8-cfa7-44db-8808-f1d4a448fc41","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"f2f895df-a1cd-4b07-b2c2-dbe48c12c662","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23944c-aec4-4384-ae56-bcb5d5054429","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"eb96dd54-13a3-458d-b303-66b3f9a1fe74","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aad3a77b-5f07-4a2f-8b97-3c6c625072f0","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"851899ff-c5eb-42b3-b18b-486c4c5947b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa4297c7-4744-4b2b-88b9-d9241f102cba","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"12af99af-7b96-43db-bf90-0222c72d3b58","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f35ea38-ff95-41e1-9957-f848343bcb44","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"b8d65b58-5618-48bf-b200-284529f76045","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3a5edae-6658-4a95-bc06-7e7f19eced08","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"50dd35c3-aab1-4933-ba9d-93817f92012c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be6ece33-3b72-476c-8eaf-d6bb5d4575b3","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"b11030a8-9d6d-4152-afff-bceb830afae4","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b61db9a0-df4d-427b-bf24-6cc731506d33","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"3d6e67ce-ae84-49fa-8ef8-d44e085175b3","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3394bbc7-82d0-4e5d-a236-9c4e8bcc79b5","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"22ded7de-2c91-4154-9bf6-e213665e8e51","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cda145ee-2907-4c9f-a808-96b0a4c4df0e","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"fdda9b15-c43d-4819-a9e7-a2072367ec96","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72f5149d-1e45-4fcd-b0e5-91b00da6c9b4","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"d9afa43c-2c1c-4000-b560-892e3c3aa668","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0e37413-bb00-48fd-aa74-37842ae04a70","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"3c60f73e-ae15-4545-8dcb-51100dcfb71d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bcd4533-69fe-4a79-90a8-c5657a887a46","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"4ebb7b4e-ad3c-4920-89de-5e63bad6682e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+            {"$Keyframe<SpriteFrameKeyframe>":"","Channels":{
+                "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8efdfcb4-637d-44c6-9028-a9ec4c30435c","path":"sprites/sPlayerFocus/sPlayerFocus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},
+              },"Disabled":false,"id":"656855d2-83f0-47f6-b735-38c4c612575b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe<SpriteFrameKeyframe>","resourceVersion":"2.0","Stretch":false,},
+          ],"resourceType":"KeyframeStore<SpriteFrameKeyframe>","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,},
+    ],
+    "visibleRange":null,
+    "volume":1.0,
+    "xorigin":36,
+    "yorigin":128,
+  },
+  "swatchColours":null,
+  "swfPrecision":0.5,
+  "textureGroupId":{
+    "name":"Default",
+    "path":"texturegroups/Default",
+  },
+  "type":0,
+  "VTile":false,
+  "width":72,
+}