Change state export variable names.
This commit is contained in:
parent
ab0d2ac5b7
commit
e8aa0bbbb9
|
|
@ -1,4 +1,4 @@
|
||||||
class_name ModifierProperties
|
class_name DEPR_ModifierProperties
|
||||||
extends Reference
|
extends Reference
|
||||||
|
|
||||||
var modifier_type: int = 0
|
var modifier_type: int = 0
|
||||||
|
|
@ -134,10 +134,10 @@ func _on_state_change(old_state_name:String, new_state :State):
|
||||||
|
|
||||||
func move_actor_as_desired( x_move_direction_override: float = 0):
|
func move_actor_as_desired( x_move_direction_override: float = 0):
|
||||||
var delta:float = physics_delta
|
var delta:float = physics_delta
|
||||||
var _move_speed = current_state.move_speed
|
var _move_speed = current_state.horizontal_speed
|
||||||
var _move_speed_modifier = current_state.move_speed_modifier
|
var _move_acceleration = current_state.horizontal_acceleration
|
||||||
var _move_modifier_move_acceleration = current_state.move_modifier_move_acceleration
|
var _move_speed_modifier = current_state.horizontal_speed_offset
|
||||||
var _move_acceleration = current_state.move_acceleration
|
var _move_modifier_move_acceleration = current_state.horizontal_speed_offset_acceleration
|
||||||
var _jerk_factor = current_state.jerk_factor
|
var _jerk_factor = current_state.jerk_factor
|
||||||
var _gravity = current_state.gravity
|
var _gravity = current_state.gravity
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,13 @@ extends State
|
||||||
## @WIP
|
## @WIP
|
||||||
|
|
||||||
# Movement Speed in Pixels Per Second
|
# Movement Speed in Pixels Per Second
|
||||||
export var move_speed: float = 60
|
# The b
|
||||||
export var move_acceleration: float = 0
|
export var horizontal_speed: float = 60
|
||||||
export var move_speed_modifier: float = 0
|
export var horizontal_acceleration: float = 0
|
||||||
export var move_modifier_move_acceleration: float = 0
|
## Movement Speed Offsets (Positive or Negative)
|
||||||
|
export var horizontal_speed_offset: float = 0
|
||||||
|
## Applies only if offset applies
|
||||||
|
export var horizontal_speed_offset_acceleration: float = 0
|
||||||
export var jerk_factor: float = 0
|
export var jerk_factor: float = 0
|
||||||
|
|
||||||
var gravity: int = ProjectSettings.get_setting("physics/2d/default_gravity")
|
var gravity: int = ProjectSettings.get_setting("physics/2d/default_gravity")
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,8 @@ signal state_changed(old_state_name, new_state)
|
||||||
|
|
||||||
|
|
||||||
var current_state: State
|
var current_state: State
|
||||||
#var state_modifiers: Array
|
var state_modifiers: Array
|
||||||
|
|
||||||
export var starting_state_name = 'default'
|
export var starting_state_name = 'default'
|
||||||
export(Array,Resource) var states
|
export(Array,Resource) var states
|
||||||
var states_index :Dictionary
|
var states_index :Dictionary
|
||||||
|
|
|
||||||
|
|
@ -20,9 +20,14 @@ _global_script_classes=[ {
|
||||||
"path": "res://lib/classes/animated_sprite_state_receiver.gd"
|
"path": "res://lib/classes/animated_sprite_state_receiver.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "Reference",
|
"base": "Reference",
|
||||||
|
"class": "DEPR_ModifierProperties",
|
||||||
|
"language": "GDScript",
|
||||||
|
"path": "res://lib/classes/DEPR_state_modifier_properties.gd"
|
||||||
|
}, {
|
||||||
|
"base": "Reference",
|
||||||
"class": "DumbOldStateModifier",
|
"class": "DumbOldStateModifier",
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
"path": "res://lib/classes/state_modifier.gd"
|
"path": "res://lib/classes/DEPR_state_modifier.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "",
|
"base": "",
|
||||||
"class": "GitAPI",
|
"class": "GitAPI",
|
||||||
|
|
@ -54,11 +59,6 @@ _global_script_classes=[ {
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
"path": "res://src/classes/Level.gd"
|
"path": "res://src/classes/Level.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "Reference",
|
|
||||||
"class": "ModifierProperties",
|
|
||||||
"language": "GDScript",
|
|
||||||
"path": "res://lib/classes/state_modifier_properties.gd"
|
|
||||||
}, {
|
|
||||||
"base": "Node2D",
|
"base": "Node2D",
|
||||||
"class": "Modifier_Receiver",
|
"class": "Modifier_Receiver",
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
|
|
@ -97,6 +97,7 @@ _global_script_classes=[ {
|
||||||
_global_script_class_icons={
|
_global_script_class_icons={
|
||||||
"Actor": "",
|
"Actor": "",
|
||||||
"AnimatedSprite_StateReceiver": "",
|
"AnimatedSprite_StateReceiver": "",
|
||||||
|
"DEPR_ModifierProperties": "",
|
||||||
"DumbOldStateModifier": "",
|
"DumbOldStateModifier": "",
|
||||||
"GitAPI": "",
|
"GitAPI": "",
|
||||||
"HealthComponent": "",
|
"HealthComponent": "",
|
||||||
|
|
@ -104,7 +105,6 @@ _global_script_class_icons={
|
||||||
"Interactable": "",
|
"Interactable": "",
|
||||||
"Interactable_Receiver": "",
|
"Interactable_Receiver": "",
|
||||||
"Level": "",
|
"Level": "",
|
||||||
"ModifierProperties": "",
|
|
||||||
"Modifier_Receiver": "",
|
"Modifier_Receiver": "",
|
||||||
"MovementComponent": "",
|
"MovementComponent": "",
|
||||||
"Movement_StateReceiver": "",
|
"Movement_StateReceiver": "",
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,10 @@ script = ExtResource( 7 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "move"
|
name = "move"
|
||||||
move_speed = 90.0
|
horizontal_speed = 90.0
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "run" ]
|
animation_sequence = [ "run" ]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ script = ExtResource( 1 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "attack_shoot"
|
name = "attack_shoot"
|
||||||
move_speed = 1.36422e-12
|
horizontal_speed = 1.36422e-12
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "attack-shoot" ]
|
animation_sequence = [ "attack-shoot" ]
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ script = ExtResource( 1 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "attack_sword"
|
name = "attack_sword"
|
||||||
move_speed = 1.36422e-12
|
horizontal_speed = 1.36422e-12
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "attack-sword" ]
|
animation_sequence = [ "attack-sword" ]
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ script = ExtResource( 1 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "fall"
|
name = "fall"
|
||||||
move_speed = 90.0
|
horizontal_speed = 90.0
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "jump" ]
|
animation_sequence = [ "jump" ]
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ script = ExtResource( 1 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "idle"
|
name = "idle"
|
||||||
move_speed = 1.36422e-12
|
horizontal_speed = 1.36422e-12
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "idle" ]
|
animation_sequence = [ "idle" ]
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ script = ExtResource( 1 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "jump"
|
name = "jump"
|
||||||
move_speed = 90.0
|
horizontal_speed = 90.0
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "jump" ]
|
animation_sequence = [ "jump" ]
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ script = ExtResource( 1 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "land"
|
name = "land"
|
||||||
move_speed = 30.0
|
horizontal_speed = 20.0
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "land" ]
|
animation_sequence = [ "land" ]
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ script = ExtResource( 1 )
|
||||||
debug_state = false
|
debug_state = false
|
||||||
timeout_seconds = 0.0
|
timeout_seconds = 0.0
|
||||||
name = "roll"
|
name = "roll"
|
||||||
move_speed = 150.0
|
horizontal_speed = 60.0
|
||||||
move_acceleration = 0.0
|
horizontal_acceleration = 0.0
|
||||||
move_speed_modifier = 0.0
|
horizontal_speed_offset = 0.0
|
||||||
move_modifier_move_acceleration = 0.0
|
horizontal_speed_offset_acceleration = 0.0
|
||||||
jerk_factor = 0.0
|
jerk_factor = 0.0
|
||||||
animation_sequence = [ "roll" ]
|
animation_sequence = [ "roll" ]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user