1 files changed, 48 insertions, 70 deletions

diff --git a/modules/visual_script/visual_script_func_nodes.h b/modules/visual_script/visual_script_func_nodes.h
index 2ccc61242a..9d2c26faf0 100644
--- a/modules/visual_script/visual_script_func_nodes.h
+++ b/modules/visual_script/visual_script_func_nodes.h
@@ -14,19 +14,36 @@ public:
 		CALL_MODE_INSTANCE,
 		CALL_MODE_BASIC_TYPE,
 	};
+
+	enum RPCCallMode {
+		RPC_DISABLED,
+		RPC_RELIABLE,
+		RPC_UNRELIABLE,
+		RPC_RELIABLE_TO_ID,
+		RPC_UNRELIABLE_TO_ID
+	};
+
 private:
 
 	CallMode call_mode;
 	StringName base_type;
+	String base_script;
 	Variant::Type basic_type;
 	NodePath base_path;
 	StringName function;
 	int use_default_args;
+	RPCCallMode rpc_call_mode;
+
 
 	Node *_get_base_node() const;
 	StringName _get_base_type() const;
 
-	void _update_defargs();
+	MethodInfo method_cache;
+	void _update_method_cache();
+
+	void _set_argument_cache(const Dictionary& p_args);
+	Dictionary _get_argument_cache() const;
+
 protected:
 	virtual void _validate_property(PropertyInfo& property) const;
 
@@ -58,6 +75,9 @@ public:
 	void set_base_type(const StringName& p_type);
 	StringName get_base_type() const;
 
+	void set_base_script(const String& p_path);
+	String get_base_script() const;
+
 	void set_function(const StringName& p_type);
 	StringName get_function() const;
 
@@ -70,12 +90,16 @@ public:
 	void set_use_default_args(int p_amount);
 	int get_use_default_args() const;
 
+	void set_rpc_call_mode(RPCCallMode p_mode);
+	RPCCallMode get_rpc_call_mode() const;
+
 	virtual VisualScriptNodeInstance* instance(VisualScriptInstance* p_instance);
 
 	VisualScriptFunctionCall();
 };
 
 VARIANT_ENUM_CAST(VisualScriptFunctionCall::CallMode );
+VARIANT_ENUM_CAST(VisualScriptFunctionCall::RPCCallMode );
 
 
 class VisualScriptPropertySet : public VisualScriptNode {
@@ -92,9 +116,12 @@ public:
 	};
 private:
 
+	PropertyInfo type_cache;
+
 	CallMode call_mode;
 	Variant::Type basic_type;	
 	StringName base_type;
+	String base_script;
 	NodePath base_path;
 	StringName property;
 	bool use_builtin_value;
@@ -106,6 +133,12 @@ private:
 
 	void _update_base_type();
 
+	void _update_cache();
+
+	void _set_type_cache(const Dictionary& p_type);
+	Dictionary _get_type_cache() const;
+
+
 protected:
 	virtual void _validate_property(PropertyInfo& property) const;
 
@@ -134,6 +167,9 @@ public:
 	void set_base_type(const StringName& p_type);
 	StringName get_base_type() const;
 
+	void set_base_script(const String& p_path);
+	String get_base_script() const;
+
 	void set_basic_type(Variant::Type p_type);
 	Variant::Type get_basic_type() const;
 
@@ -171,14 +207,17 @@ public:
 		CALL_MODE_SELF,
 		CALL_MODE_NODE_PATH,
 		CALL_MODE_INSTANCE,
-		CALL_MODE_BASIC_TYPE
+		CALL_MODE_BASIC_TYPE,
 
 	};
 private:
 
+	Variant::Type type_cache;
+
 	CallMode call_mode;
 	Variant::Type basic_type;
 	StringName base_type;
+	String base_script;
 	NodePath base_path;
 	StringName property;
 	InputEvent::Type event_type;
@@ -187,6 +226,10 @@ private:
 	Node *_get_base_node() const;
 	StringName _get_base_type() const;
 
+	void _update_cache();
+
+	void _set_type_cache(Variant::Type p_type);
+	Variant::Type _get_type_cache() const;
 
 protected:
 	virtual void _validate_property(PropertyInfo& property) const;
@@ -216,6 +259,9 @@ public:
 	void set_base_type(const StringName& p_type);
 	StringName get_base_type() const;
 
+	void set_base_script(const String& p_path);
+	String get_base_script() const;
+
 	void set_basic_type(Variant::Type p_type);
 	Variant::Type get_basic_type() const;
 
@@ -244,74 +290,6 @@ VARIANT_ENUM_CAST(VisualScriptPropertyGet::CallMode );
 
 
 
-class VisualScriptScriptCall : public VisualScriptNode {
-
-	OBJ_TYPE(VisualScriptScriptCall,VisualScriptNode)
-public:
-	enum CallMode {
-		CALL_MODE_SELF,
-		CALL_MODE_NODE_PATH,
-	};
-private:
-
-	CallMode call_mode;
-	NodePath base_path;
-	StringName function;
-	int argument_count;
-
-
-	Node *_get_base_node() const;
-
-
-	void _update_argument_count();
-protected:
-	virtual void _validate_property(PropertyInfo& property) const;
-
-	static void _bind_methods();
-
-public:
-
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
-
-
-	virtual String get_output_sequence_port_text(int p_port) const;
-
-
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
-
-
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
-
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
-
-	void set_function(const StringName& p_type);
-	StringName get_function() const;
-
-	void set_base_path(const NodePath& p_type);
-	NodePath get_base_path() const;
-
-	void set_call_mode(CallMode p_mode);
-	CallMode get_call_mode() const;
-
-	void set_argument_count(int p_count);
-	int get_argument_count() const;
-
-
-	virtual VisualScriptNodeInstance* instance(VisualScriptInstance* p_instance);
-
-	VisualScriptScriptCall();
-};
-
-VARIANT_ENUM_CAST(VisualScriptScriptCall::CallMode );
-
-
-
-
 class VisualScriptEmitSignal : public VisualScriptNode {
 
 	OBJ_TYPE(VisualScriptEmitSignal,VisualScriptNode)