From 04aece49a203110afab61fea6827405062678c24 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:47:27 +0200
Subject: [PATCH 01/26] no idea what i'm doing here
but i've made changes to these 2 files to allow for this Range Adjust stuff
---
Source/Game/attackscript.cpp | 16 ++++++++++++++++
Source/Game/attackscript.h | 6 ++++++
2 files changed, 22 insertions(+)
diff --git a/Source/Game/attackscript.cpp b/Source/Game/attackscript.cpp
index d2fe5e21a..15ddd1d63 100644
--- a/Source/Game/attackscript.cpp
+++ b/Source/Game/attackscript.cpp
@@ -138,6 +138,16 @@ float AttackScriptGetter::GetForce() {
return attack_ref_.valid() ? RangedRandomFloat(attack_ref_->force[0], attack_ref_->force[1]) : 0.0f;
}
+// Glimpse - Range Adjust
+bool AttackScriptGetter::HasRangeAdjust() {
+ return attack_ref_.valid() ? attack_ref_->has_range_adjust : false;
+}
+
+float AttackScriptGetter::GetRangeAdjust() {
+ return attack_ref_.valid() ? RangedRandomFloat(attack_ref_->range_adjust[0], attack_ref_->range_adjust[1]) : 0.0f;
+}
+// Glimpse - Range Adjust
+
std::string AttackScriptGetter::GetPath() {
return path_;
}
@@ -188,6 +198,12 @@ void AttachAttackScriptGetter(ASContext *as_context) {
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetSharpDamage()", asMETHOD(AttackScriptGetter, GetSharpDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetDamage()", asMETHOD(AttackScriptGetter, GetDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetForce()", asMETHOD(AttackScriptGetter, GetForce), asCALL_THISCALL);
+
+ // Glimpse - Range Adjust
+ as_context->RegisterObjectMethod("AttackScriptGetter", "bool HasRangeAdjust()", asMETHOD(AttackScriptGetter, HasRangeAdjust), asCALL_THISCALL);
+ as_context->RegisterObjectMethod("AttackScriptGetter", "float GetRangeAdjust()", asMETHOD(AttackScriptGetter, GetRangeAdjust), asCALL_THISCALL);
+ // Glimpse - Range Adjust
+
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMirrored()", asMETHOD(AttackScriptGetter, GetMirrored), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMobile()", asMETHOD(AttackScriptGetter, GetMobile), asCALL_THISCALL);
as_context->DocsCloseBrace();
diff --git a/Source/Game/attackscript.h b/Source/Game/attackscript.h
index 2c14e9152..5d3a7ca18 100644
--- a/Source/Game/attackscript.h
+++ b/Source/Game/attackscript.h
@@ -49,6 +49,12 @@ class AttackScriptGetter {
float GetSharpDamage();
float GetDamage();
float GetForce();
+
+ // Glimpse - Range Adjust
+ bool HasRangeAdjust();
+ float GetRangeAdjust();
+ // Glimpse - Range Adjust
+
std::string GetPath();
std::string GetSpecial();
int GetUnblockable();
From 1da1b3d2ea5ba4a73b2aa421ae2af1a69e54eb14 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:51:06 +0200
Subject: [PATCH 02/26] attackscript files changed for Range Adjust
Okay I think I'm starting to understand this.
Possibly.
From 139c7d2108e6e785742eec91c274c308d3c16499 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:55:20 +0200
Subject: [PATCH 03/26] More file changes for Range Adjust
---
Source/Asset/Asset/attacks.cpp | 14 ++++++++++++++
Source/Asset/Asset/attacks.h | 6 ++++++
2 files changed, 20 insertions(+)
diff --git a/Source/Asset/Asset/attacks.cpp b/Source/Asset/Asset/attacks.cpp
index ae7ff4d55..5a8f4df5d 100644
--- a/Source/Asset/Asset/attacks.cpp
+++ b/Source/Asset/Asset/attacks.cpp
@@ -62,6 +62,13 @@ void Attack::clear() {
damage[1] = 0.0f;
force[0] = 0.0f;
force[1] = 0.0f;
+
+ // Glimpse - Range Adjust
+ has_range_adjust = false;
+ range_adjust[0] = 0.0f;
+ range_adjust[1] = 1.0f;
+ // Glimpse - Range Adjust
+
unblockable = false;
flesh_unblockable = false;
mobile = false;
@@ -191,6 +198,13 @@ int Attack::Load(const string& path, uint32_t load_flags) {
} else if (field_str == "force") {
GetRange(field, "val", "min", "max", force[0], force[1]);
}
+ // Glimpse - Range Adjust
+ else if (field_str == "range_adjust")
+ {
+ has_range_adjust = true;
+ GetRange(field, "val", "min", "max", range_adjust[0], range_adjust[1]);
+ }
+ // Glimpse - Range Adjust
}
} else {
return kLoadErrorMissingFile;
diff --git a/Source/Asset/Asset/attacks.h b/Source/Asset/Asset/attacks.h
index a17e31f4e..50b6f4b65 100644
--- a/Source/Asset/Asset/attacks.h
+++ b/Source/Asset/Asset/attacks.h
@@ -74,6 +74,12 @@ class Attack : public AssetInfo {
float block_damage[2];
float damage[2];
float force[2];
+
+ // Glimpse - Range Adjust
+ bool has_range_adjust;
+ float range_adjust[2];
+ // Glimpse - Range Adjust
+
string materialevent;
vec3 cut_plane;
bool has_cut_plane;
From 71d89daa119cef106f086ad1c287f198fa7c7b39 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:57:12 +0200
Subject: [PATCH 04/26] Text files with info on changes
---
...de - Testing and Other Fun Information.txt | 35 ++++++++++
...st - Testing and Other Fun Information.txt | 47 ++++++++++++++
...it - Testing and Other Fun Information.txt | 65 +++++++++++++++++++
3 files changed, 147 insertions(+)
create mode 100644 Disable Editor In Media Mode - Testing and Other Fun Information.txt
create mode 100644 Range Adjust - Testing and Other Fun Information.txt
create mode 100644 Toggle Shadow Decal Edit - Testing and Other Fun Information.txt
diff --git a/Disable Editor In Media Mode - Testing and Other Fun Information.txt b/Disable Editor In Media Mode - Testing and Other Fun Information.txt
new file mode 100644
index 000000000..d0b01ff53
--- /dev/null
+++ b/Disable Editor In Media Mode - Testing and Other Fun Information.txt
@@ -0,0 +1,35 @@
+Changed Files:
+overgrowth-main\Source\Editors\map_editor.cpp
+
+
+
+Functionality:
+While in Media Mode, all regular editor controls are disabled.
+This includes making selections, adding to selections, selecting/deselecting all, scroll select, ctrl+c/x/v, etc.
+To kinda be more exact about what's disabled in Media Mode - All editor transform tool stuff, and all editor keyboard shortcuts.
+
+
+
+Implementation:
+In the If-Statements where it checks whether or not it should do a certain editor thing, I just added "&& not_in_media_mode_lol"
+For example, the Select All feature used to look like: if (KeyCommand::CheckPressed(keyboard, KeyCommand::kSelectAll, KIMF_LEVEL_EDITOR_GENERAL))
+And now it looks like: if (!Graphics::Instance()->media_mode() && KeyCommand::CheckPressed(keyboard, KeyCommand::kSelectAll, KIMF_LEVEL_EDITOR_GENERAL))
+Rinse-Repeat for all the yams.
+
+
+
+Reason For Existing:
+Still being able to select/change stuff while in Media Mode sucked (especially 'cause you couldn't see your cursor), and is almost definitely not intended behaviour.
+
+
+
+Testing:
+• Tested on a large variety of levels, both pre-existing and newly created.
+
+• Tested with having no selections before entering Media Mode, and then trying to select using the mouse (double-left-clicking stuff) and keyboard shortcuts (ctrl+a
+ while in Media Mode.
+
+• Tested with having some things or all things selected before entering Media Mode, and then trying to add to the selection (shift+left-click), copy/cut, deselect all,
+ etc.
+
+• Tested with selecting and copying a selection before entering Media Mode, and then trying to paste that selection while in Media Mode.
\ No newline at end of file
diff --git a/Range Adjust - Testing and Other Fun Information.txt b/Range Adjust - Testing and Other Fun Information.txt
new file mode 100644
index 000000000..2476aa7d7
--- /dev/null
+++ b/Range Adjust - Testing and Other Fun Information.txt
@@ -0,0 +1,47 @@
+Changed Files:
+overgrowth-main\Source\Game\attackscript.h
+overgrowth-main\Source\Game\attackscript.cpp
+
+overgrowth-main\Source\Asset\Asset\attacks.h
+overgrowth-main\Source\Asset\Asset\attacks.cpp
+
+overgrowth-main\Data\Scripts\aschar.as
+
+
+
+Functionality:
+Allows one to add a param to an attacks .xml file that will increase or decrease the hitbox range of that attack.
+
+
+
+Implementation:
+An attack's .xml file can now have a new float param called "range_adjust".
+
+In the aschar.as file, whether or not an attack's .xml has this param can be gotten from attack_getter.HasRangeAdjust(), and the value of the param can be gotten from
+attack_getter.GetRangeAdjust().
+
+The first function just ensures that no problems are caused for the pre-existing .xml files that don't have this param.
+
+The value that the second function returns will be added to (or, I guess, subtracted from if the value is negative) the distance check performed in
+HandleAnimationCombatEvent(). This allows one to have finer control over how close the player (or any character) has to be to their opponent for a particular attack of
+theirs to hit.
+
+The reason I chose the method of adding to/subtracting from the range of an attack, instead of out-right overriding it, is because with this method it's really easy to look at an attack in-game and think "This could use a lil' bit more/less range." and so add or subtract from it respectively.
+
+Note: This only adjusts the *hitbox* range of a particular attack, and not from how far away someone must be to an opponent in order for an attack to trigger in the
+first place.
+
+
+
+Reason For Existing:
+Constance mentioned goofy range being a problem with the upper-cut attack in the Drowned Set she made for Ouruin - so this fixes that.
+It's also just a pretty cool thing for modders generally speaking, both for giving them more freedom and for balancing goofy hitboxes wherever they are.
+
+
+
+Testing:
+• Tested on a large variety of attacks, including weapon attacks and on all 5 species.
+
+• Tested with having an absurdly high range_adjust value, and an absurdly low range_adjust value.
+ (Note: Having an absurdly low range-adjust value (i.e. one that makes the total range have a negative value) will cause the attack to always miss. This is because
+ distance cannot be negative, so the distance between some guy and their opponent will always be more than the attack range value.)
\ No newline at end of file
diff --git a/Toggle Shadow Decal Edit - Testing and Other Fun Information.txt b/Toggle Shadow Decal Edit - Testing and Other Fun Information.txt
new file mode 100644
index 000000000..292fc5aa2
--- /dev/null
+++ b/Toggle Shadow Decal Edit - Testing and Other Fun Information.txt
@@ -0,0 +1,65 @@
+Changed Files:
+
+overgrowth-main\Source\Editors\entity_type.h
+overgrowth-main\Source\Editors\entity_type.cpp
+overgrowth-main\Source\Editors\map_editor.cpp
+overgrowth-main\Source\Editors\actors_editor.cpp
+
+overgrowth-main\Source\Asset\Asset\decalfile.h
+overgrowth-main\Source\Asset\Asset\decalfile.cpp
+
+overgrowth-main\Source\Objects\decalobjects.h
+overgrowth-main\Source\Objects\decalobjects.cpp
+
+overgrowth-main\Source\GUI\dimgui\dimgui.cpp
+overgrowth-main\Source\Main\scenegraph.cpp
+overgrowth-main\Source\Scripting\angelscript\asfuncs.cpp
+overgrowth-main\Source\Game\EntityDescription.cpp
+
+
+
+Functionality:
+There is now a checkbox next to "Edit decals" in the editor ribbon named "Edit shadows".
+This new checkbox allow you to toggle the editing of shadow decals independently of all other decals.
+
+
+
+Implementation:
+(Apologies about my phrasing of things if it's incorrect.)
+
+DecalObjects can now have a "flag parameter" in their .xml file called "is_shadow".
+Setting this flag to true, will result in that particular DecalObject returning a value of _shadow_decal_object when GetType() is called on that object (whereas DecalObjects that don't have that flag param *or* have it set to false will return _decal_object as they normally did).
+This allows the editing of those objects to be toggled independently of other DecalObjects when SetTypeEnabled is called.
+
+Throughout the rest of the code, I made sure that in instances where Objects of type _decal_object were treated differently, that all Objects of
+type _shadow_decal_objects would get that same treatment.
+This ensures that Shadow Decals still behave and function exactly the same as they did before, and that the *only* change is that they can now be
+independently toggled.
+
+
+
+Reason For Existing:
+In my experience, Shadow decals can get/have gotten in the way of placing/re-arranging Other decals or vice versa depending on which pass was done
+first. This is especially prevalent in interior scenes like caves that have a lot of both types of decals.
+
+
+
+Testing:
+• Tested on a large variety of levels, both pre-existing and newly created.
+
+• Tested that Shadow decals can only be selected when their checkbox is on, that Other decals can be selected when their checkbox is on, that both
+ can be selected when both checkboxes are on and that neither can be selected when neither checkbox is on.
+
+• Tested that Shadow decals are all properly deselected when their checkbox is turned off, and the same for Other decals.
+
+• Tested that placing, re-arranging, deleting and pressing ctrl+z or ctrl+shift+z all work for Shadow decals.
+
+• Tested that loading into, saving and exiting a level that has these Shadow decals doesn't cause any problems.
+
+• Tested that the Color Picker works correctly and as expected for these Shadow decals.
+
+• Tested that ctrl+a and ctrl+shift+a works correctly for both Shadow and Other decals.
+
+
+
+Also quick note - The attatched map_editor.cpp also has the Media Mode Editor Stuff Disable code.
\ No newline at end of file
From bc6882024268074162ed06c6ac474164ca09ae21 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:59:44 +0200
Subject: [PATCH 05/26] Range Adjust stuff
---
Data/Scripts/aschar.as | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/Data/Scripts/aschar.as b/Data/Scripts/aschar.as
index 420b3b1df..ec1e701b5 100644
--- a/Data/Scripts/aschar.as
+++ b/Data/Scripts/aschar.as
@@ -7333,8 +7333,17 @@ void HandleAnimationCombatEvent(const string &in event, const vec3 &in world_pos
range_extend += mix(1.0, 0.0, game_difficulty);
range_extend *= mix(1.0, 0.0, game_difficulty);
}
-
- if(event == "attackblocked" || distance(this_mo.position, target_pos) < (_attack_range + range_extend) * this_mo.rigged_object().GetCharScale()) {
+
+ //Glimpse - Range Adjust
+ float range_adjust = 0.0f;
+
+ if(attack_getter.HasRangeAdjust())
+ {
+ range_adjust = attack_getter.GetRangeAdjust();
+ }
+ //Glimpse - Range Adjust
+ //Glimpse - "+ range_adjust" added here.
+ if(event == "attackblocked" || distance(this_mo.position, target_pos) < (_attack_range + range_extend + range_adjust) * this_mo.rigged_object().GetCharScale()) {
vec3 facing = this_mo.GetFacing();
vec3 facing_right = vec3(-facing.z, facing.y, facing.x);
vec3 dir = normalize(target_pos - this_mo.position);
@@ -7652,10 +7661,14 @@ bool IsLayerAttacking() {
return last_knife_time <= time && last_knife_time >= time - 0.3f;
}
-float GetAttackRange() {
- if(on_ground) {
+float GetAttackRange()
+{
+ if(on_ground)
+ {
return (_attack_range + range_extender) * range_multiplier * this_mo.rigged_object().GetCharScale() - _leg_sphere_size;
- } else {
+ }
+ else
+ {
return _attack_range * this_mo.rigged_object().GetCharScale() - _leg_sphere_size;
}
}
@@ -7671,6 +7684,7 @@ void UpdateGroundAttackControls(const Timestep &in ts) {
}
// DebugDrawWireSphere(this_mo.position, _attack_range + range_extender, vec3(1.0f), _delete_on_update);
+
const float range = GetAttackRange();
int attack_id = -1;
int throw_id = -1;
From fcaa7fbe9b5656df41f659b1e61da0909d3fc2c2 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:12:53 +0200
Subject: [PATCH 06/26] Delete Toggle Shadow Decal Edit - Testing and Other Fun
Information.txt
---
...it - Testing and Other Fun Information.txt | 65 -------------------
1 file changed, 65 deletions(-)
delete mode 100644 Toggle Shadow Decal Edit - Testing and Other Fun Information.txt
diff --git a/Toggle Shadow Decal Edit - Testing and Other Fun Information.txt b/Toggle Shadow Decal Edit - Testing and Other Fun Information.txt
deleted file mode 100644
index 292fc5aa2..000000000
--- a/Toggle Shadow Decal Edit - Testing and Other Fun Information.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Changed Files:
-
-overgrowth-main\Source\Editors\entity_type.h
-overgrowth-main\Source\Editors\entity_type.cpp
-overgrowth-main\Source\Editors\map_editor.cpp
-overgrowth-main\Source\Editors\actors_editor.cpp
-
-overgrowth-main\Source\Asset\Asset\decalfile.h
-overgrowth-main\Source\Asset\Asset\decalfile.cpp
-
-overgrowth-main\Source\Objects\decalobjects.h
-overgrowth-main\Source\Objects\decalobjects.cpp
-
-overgrowth-main\Source\GUI\dimgui\dimgui.cpp
-overgrowth-main\Source\Main\scenegraph.cpp
-overgrowth-main\Source\Scripting\angelscript\asfuncs.cpp
-overgrowth-main\Source\Game\EntityDescription.cpp
-
-
-
-Functionality:
-There is now a checkbox next to "Edit decals" in the editor ribbon named "Edit shadows".
-This new checkbox allow you to toggle the editing of shadow decals independently of all other decals.
-
-
-
-Implementation:
-(Apologies about my phrasing of things if it's incorrect.)
-
-DecalObjects can now have a "flag parameter" in their .xml file called "is_shadow".
-Setting this flag to true, will result in that particular DecalObject returning a value of _shadow_decal_object when GetType() is called on that object (whereas DecalObjects that don't have that flag param *or* have it set to false will return _decal_object as they normally did).
-This allows the editing of those objects to be toggled independently of other DecalObjects when SetTypeEnabled is called.
-
-Throughout the rest of the code, I made sure that in instances where Objects of type _decal_object were treated differently, that all Objects of
-type _shadow_decal_objects would get that same treatment.
-This ensures that Shadow Decals still behave and function exactly the same as they did before, and that the *only* change is that they can now be
-independently toggled.
-
-
-
-Reason For Existing:
-In my experience, Shadow decals can get/have gotten in the way of placing/re-arranging Other decals or vice versa depending on which pass was done
-first. This is especially prevalent in interior scenes like caves that have a lot of both types of decals.
-
-
-
-Testing:
-• Tested on a large variety of levels, both pre-existing and newly created.
-
-• Tested that Shadow decals can only be selected when their checkbox is on, that Other decals can be selected when their checkbox is on, that both
- can be selected when both checkboxes are on and that neither can be selected when neither checkbox is on.
-
-• Tested that Shadow decals are all properly deselected when their checkbox is turned off, and the same for Other decals.
-
-• Tested that placing, re-arranging, deleting and pressing ctrl+z or ctrl+shift+z all work for Shadow decals.
-
-• Tested that loading into, saving and exiting a level that has these Shadow decals doesn't cause any problems.
-
-• Tested that the Color Picker works correctly and as expected for these Shadow decals.
-
-• Tested that ctrl+a and ctrl+shift+a works correctly for both Shadow and Other decals.
-
-
-
-Also quick note - The attatched map_editor.cpp also has the Media Mode Editor Stuff Disable code.
\ No newline at end of file
From 1221c232edcf8089773f37de10aef1cdede03c1b Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:13:16 +0200
Subject: [PATCH 07/26] Delete Disable Editor In Media Mode - Testing and Other
Fun Information.txt
---
...de - Testing and Other Fun Information.txt | 35 -------------------
1 file changed, 35 deletions(-)
delete mode 100644 Disable Editor In Media Mode - Testing and Other Fun Information.txt
diff --git a/Disable Editor In Media Mode - Testing and Other Fun Information.txt b/Disable Editor In Media Mode - Testing and Other Fun Information.txt
deleted file mode 100644
index d0b01ff53..000000000
--- a/Disable Editor In Media Mode - Testing and Other Fun Information.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Changed Files:
-overgrowth-main\Source\Editors\map_editor.cpp
-
-
-
-Functionality:
-While in Media Mode, all regular editor controls are disabled.
-This includes making selections, adding to selections, selecting/deselecting all, scroll select, ctrl+c/x/v, etc.
-To kinda be more exact about what's disabled in Media Mode - All editor transform tool stuff, and all editor keyboard shortcuts.
-
-
-
-Implementation:
-In the If-Statements where it checks whether or not it should do a certain editor thing, I just added "&& not_in_media_mode_lol"
-For example, the Select All feature used to look like: if (KeyCommand::CheckPressed(keyboard, KeyCommand::kSelectAll, KIMF_LEVEL_EDITOR_GENERAL))
-And now it looks like: if (!Graphics::Instance()->media_mode() && KeyCommand::CheckPressed(keyboard, KeyCommand::kSelectAll, KIMF_LEVEL_EDITOR_GENERAL))
-Rinse-Repeat for all the yams.
-
-
-
-Reason For Existing:
-Still being able to select/change stuff while in Media Mode sucked (especially 'cause you couldn't see your cursor), and is almost definitely not intended behaviour.
-
-
-
-Testing:
-• Tested on a large variety of levels, both pre-existing and newly created.
-
-• Tested with having no selections before entering Media Mode, and then trying to select using the mouse (double-left-clicking stuff) and keyboard shortcuts (ctrl+a
- while in Media Mode.
-
-• Tested with having some things or all things selected before entering Media Mode, and then trying to add to the selection (shift+left-click), copy/cut, deselect all,
- etc.
-
-• Tested with selecting and copying a selection before entering Media Mode, and then trying to paste that selection while in Media Mode.
\ No newline at end of file
From 294990c892907ed9ba992d8ab583e35cfd9a834a Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:21:47 +0200
Subject: [PATCH 08/26] fixed script formatting
I tend to leave comments such as //Glimpse and do some other stuff to code while I'm working on it so it's easier for me to jump around to where I'm making changes with ctrl+f - but I have no idea how this merging stuff works so I'ma just undo all of that and keep the formatting of the code as close to how it is by default as possible.
---
Data/Scripts/aschar.as | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/Data/Scripts/aschar.as b/Data/Scripts/aschar.as
index ec1e701b5..a7f138e04 100644
--- a/Data/Scripts/aschar.as
+++ b/Data/Scripts/aschar.as
@@ -7334,16 +7334,13 @@ void HandleAnimationCombatEvent(const string &in event, const vec3 &in world_pos
range_extend *= mix(1.0, 0.0, game_difficulty);
}
- //Glimpse - Range Adjust
float range_adjust = 0.0f;
- if(attack_getter.HasRangeAdjust())
- {
+ if(attack_getter.HasRangeAdjust()){
range_adjust = attack_getter.GetRangeAdjust();
}
- //Glimpse - Range Adjust
- //Glimpse - "+ range_adjust" added here.
- if(event == "attackblocked" || distance(this_mo.position, target_pos) < (_attack_range + range_extend + range_adjust) * this_mo.rigged_object().GetCharScale()) {
+
+ if(event == "attackblocked" || distance(this_mo.position, target_pos) < (_attack_range + range_extend) * this_mo.rigged_object().GetCharScale()) {
vec3 facing = this_mo.GetFacing();
vec3 facing_right = vec3(-facing.z, facing.y, facing.x);
vec3 dir = normalize(target_pos - this_mo.position);
@@ -7661,14 +7658,10 @@ bool IsLayerAttacking() {
return last_knife_time <= time && last_knife_time >= time - 0.3f;
}
-float GetAttackRange()
-{
- if(on_ground)
- {
+float GetAttackRange() {
+ if(on_ground) {
return (_attack_range + range_extender) * range_multiplier * this_mo.rigged_object().GetCharScale() - _leg_sphere_size;
- }
- else
- {
+ } else {
return _attack_range * this_mo.rigged_object().GetCharScale() - _leg_sphere_size;
}
}
@@ -7684,7 +7677,6 @@ void UpdateGroundAttackControls(const Timestep &in ts) {
}
// DebugDrawWireSphere(this_mo.position, _attack_range + range_extender, vec3(1.0f), _delete_on_update);
-
const float range = GetAttackRange();
int attack_id = -1;
int throw_id = -1;
From b2fe484e6a23533d4d0dd604927d69314d32c47b Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:24:50 +0200
Subject: [PATCH 09/26] fixed script formatting
---
Source/Game/attackscript.cpp | 6 ------
Source/Game/attackscript.h | 4 ----
2 files changed, 10 deletions(-)
diff --git a/Source/Game/attackscript.cpp b/Source/Game/attackscript.cpp
index 15ddd1d63..cd0f3dd51 100644
--- a/Source/Game/attackscript.cpp
+++ b/Source/Game/attackscript.cpp
@@ -138,7 +138,6 @@ float AttackScriptGetter::GetForce() {
return attack_ref_.valid() ? RangedRandomFloat(attack_ref_->force[0], attack_ref_->force[1]) : 0.0f;
}
-// Glimpse - Range Adjust
bool AttackScriptGetter::HasRangeAdjust() {
return attack_ref_.valid() ? attack_ref_->has_range_adjust : false;
}
@@ -146,7 +145,6 @@ bool AttackScriptGetter::HasRangeAdjust() {
float AttackScriptGetter::GetRangeAdjust() {
return attack_ref_.valid() ? RangedRandomFloat(attack_ref_->range_adjust[0], attack_ref_->range_adjust[1]) : 0.0f;
}
-// Glimpse - Range Adjust
std::string AttackScriptGetter::GetPath() {
return path_;
@@ -198,12 +196,8 @@ void AttachAttackScriptGetter(ASContext *as_context) {
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetSharpDamage()", asMETHOD(AttackScriptGetter, GetSharpDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetDamage()", asMETHOD(AttackScriptGetter, GetDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetForce()", asMETHOD(AttackScriptGetter, GetForce), asCALL_THISCALL);
-
- // Glimpse - Range Adjust
as_context->RegisterObjectMethod("AttackScriptGetter", "bool HasRangeAdjust()", asMETHOD(AttackScriptGetter, HasRangeAdjust), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetRangeAdjust()", asMETHOD(AttackScriptGetter, GetRangeAdjust), asCALL_THISCALL);
- // Glimpse - Range Adjust
-
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMirrored()", asMETHOD(AttackScriptGetter, GetMirrored), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMobile()", asMETHOD(AttackScriptGetter, GetMobile), asCALL_THISCALL);
as_context->DocsCloseBrace();
diff --git a/Source/Game/attackscript.h b/Source/Game/attackscript.h
index 5d3a7ca18..6c9b6c24c 100644
--- a/Source/Game/attackscript.h
+++ b/Source/Game/attackscript.h
@@ -49,12 +49,8 @@ class AttackScriptGetter {
float GetSharpDamage();
float GetDamage();
float GetForce();
-
- // Glimpse - Range Adjust
bool HasRangeAdjust();
float GetRangeAdjust();
- // Glimpse - Range Adjust
-
std::string GetPath();
std::string GetSpecial();
int GetUnblockable();
From 06bf3339b65136b2c0b017c0f71dc9c447b38c20 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:25:32 +0200
Subject: [PATCH 10/26] fixed formatting
---
Source/Asset/Asset/attacks.cpp | 9 +--------
Source/Asset/Asset/attacks.h | 4 ----
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/Source/Asset/Asset/attacks.cpp b/Source/Asset/Asset/attacks.cpp
index 5a8f4df5d..eeb7f4660 100644
--- a/Source/Asset/Asset/attacks.cpp
+++ b/Source/Asset/Asset/attacks.cpp
@@ -62,13 +62,9 @@ void Attack::clear() {
damage[1] = 0.0f;
force[0] = 0.0f;
force[1] = 0.0f;
-
- // Glimpse - Range Adjust
has_range_adjust = false;
range_adjust[0] = 0.0f;
range_adjust[1] = 1.0f;
- // Glimpse - Range Adjust
-
unblockable = false;
flesh_unblockable = false;
mobile = false;
@@ -198,13 +194,10 @@ int Attack::Load(const string& path, uint32_t load_flags) {
} else if (field_str == "force") {
GetRange(field, "val", "min", "max", force[0], force[1]);
}
- // Glimpse - Range Adjust
- else if (field_str == "range_adjust")
- {
+ else if (field_str == "range_adjust") {
has_range_adjust = true;
GetRange(field, "val", "min", "max", range_adjust[0], range_adjust[1]);
}
- // Glimpse - Range Adjust
}
} else {
return kLoadErrorMissingFile;
diff --git a/Source/Asset/Asset/attacks.h b/Source/Asset/Asset/attacks.h
index 50b6f4b65..63778aeea 100644
--- a/Source/Asset/Asset/attacks.h
+++ b/Source/Asset/Asset/attacks.h
@@ -74,12 +74,8 @@ class Attack : public AssetInfo {
float block_damage[2];
float damage[2];
float force[2];
-
- // Glimpse - Range Adjust
bool has_range_adjust;
float range_adjust[2];
- // Glimpse - Range Adjust
-
string materialevent;
vec3 cut_plane;
bool has_cut_plane;
From 855405b0064f47ab30817fa7a1e53f26d38c9c50 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:28:40 +0200
Subject: [PATCH 11/26] missed a line
---
Data/Scripts/aschar.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Data/Scripts/aschar.as b/Data/Scripts/aschar.as
index a7f138e04..e292997bb 100644
--- a/Data/Scripts/aschar.as
+++ b/Data/Scripts/aschar.as
@@ -7340,7 +7340,7 @@ void HandleAnimationCombatEvent(const string &in event, const vec3 &in world_pos
range_adjust = attack_getter.GetRangeAdjust();
}
- if(event == "attackblocked" || distance(this_mo.position, target_pos) < (_attack_range + range_extend) * this_mo.rigged_object().GetCharScale()) {
+ if(event == "attackblocked" || distance(this_mo.position, target_pos) < (_attack_range + range_extend + range_adjust) * this_mo.rigged_object().GetCharScale()) {
vec3 facing = this_mo.GetFacing();
vec3 facing_right = vec3(-facing.z, facing.y, facing.x);
vec3 dir = normalize(target_pos - this_mo.position);
From b1b63a83807cadc38ce57954572fb4eca1237be9 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:31:51 +0200
Subject: [PATCH 12/26] Add files via upload
---
Source/Asset/Asset/attacks.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/Asset/Asset/attacks.cpp b/Source/Asset/Asset/attacks.cpp
index eeb7f4660..38206f87c 100644
--- a/Source/Asset/Asset/attacks.cpp
+++ b/Source/Asset/Asset/attacks.cpp
@@ -64,7 +64,7 @@ void Attack::clear() {
force[1] = 0.0f;
has_range_adjust = false;
range_adjust[0] = 0.0f;
- range_adjust[1] = 1.0f;
+ range_adjust[1] = 0.0f;
unblockable = false;
flesh_unblockable = false;
mobile = false;
From d05f1df63f7aa1890d3ce78b50b51bb072cebeb5 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:56:58 +0200
Subject: [PATCH 13/26] Add files via upload
---
Source/Game/attackscript.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Source/Game/attackscript.cpp b/Source/Game/attackscript.cpp
index cd0f3dd51..6a83101ad 100644
--- a/Source/Game/attackscript.cpp
+++ b/Source/Game/attackscript.cpp
@@ -143,7 +143,7 @@ bool AttackScriptGetter::HasRangeAdjust() {
}
float AttackScriptGetter::GetRangeAdjust() {
- return attack_ref_.valid() ? RangedRandomFloat(attack_ref_->range_adjust[0], attack_ref_->range_adjust[1]) : 0.0f;
+ return attack_ref_.valid() ? attack_ref_->range_adjust : 0.0f;
}
std::string AttackScriptGetter::GetPath() {
@@ -196,8 +196,12 @@ void AttachAttackScriptGetter(ASContext *as_context) {
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetSharpDamage()", asMETHOD(AttackScriptGetter, GetSharpDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetDamage()", asMETHOD(AttackScriptGetter, GetDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetForce()", asMETHOD(AttackScriptGetter, GetForce), asCALL_THISCALL);
+
+ // Glimpse - Range Adjust
as_context->RegisterObjectMethod("AttackScriptGetter", "bool HasRangeAdjust()", asMETHOD(AttackScriptGetter, HasRangeAdjust), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetRangeAdjust()", asMETHOD(AttackScriptGetter, GetRangeAdjust), asCALL_THISCALL);
+ // Glimpse - Range Adjust
+
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMirrored()", asMETHOD(AttackScriptGetter, GetMirrored), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMobile()", asMETHOD(AttackScriptGetter, GetMobile), asCALL_THISCALL);
as_context->DocsCloseBrace();
From e068f9bd153cdd95f794e4d0bbe70fa253f1de6e Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:58:05 +0200
Subject: [PATCH 14/26] Add files via upload
From 3c5fdc4b4e72d73a979fa43840505b1062edac05 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:58:32 +0200
Subject: [PATCH 15/26] Add files via upload
---
Source/Asset/Asset/attacks.cpp | 9 +++++----
Source/Asset/Asset/attacks.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Source/Asset/Asset/attacks.cpp b/Source/Asset/Asset/attacks.cpp
index 38206f87c..995d9614e 100644
--- a/Source/Asset/Asset/attacks.cpp
+++ b/Source/Asset/Asset/attacks.cpp
@@ -63,8 +63,7 @@ void Attack::clear() {
force[0] = 0.0f;
force[1] = 0.0f;
has_range_adjust = false;
- range_adjust[0] = 0.0f;
- range_adjust[1] = 0.0f;
+ range_adjust = 0.0f;
unblockable = false;
flesh_unblockable = false;
mobile = false;
@@ -194,9 +193,11 @@ int Attack::Load(const string& path, uint32_t load_flags) {
} else if (field_str == "force") {
GetRange(field, "val", "min", "max", force[0], force[1]);
}
- else if (field_str == "range_adjust") {
+ else if (field_str == "range_adjust")
+ {
has_range_adjust = true;
- GetRange(field, "val", "min", "max", range_adjust[0], range_adjust[1]);
+ field->QueryFloatAttribute("val", &range_adjust);
+ //GetRange(field, "val", "min", "max", range_adjust[0], range_adjust[1]);
}
}
} else {
diff --git a/Source/Asset/Asset/attacks.h b/Source/Asset/Asset/attacks.h
index 63778aeea..2c2c70cb2 100644
--- a/Source/Asset/Asset/attacks.h
+++ b/Source/Asset/Asset/attacks.h
@@ -75,7 +75,7 @@ class Attack : public AssetInfo {
float damage[2];
float force[2];
bool has_range_adjust;
- float range_adjust[2];
+ float range_adjust;
string materialevent;
vec3 cut_plane;
bool has_cut_plane;
From f3a8099794b03cc6b756cc7a58b776a783104cb6 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:58:53 +0200
Subject: [PATCH 16/26] Add files via upload
---
Range Adjust - Testing and Other Fun Information.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Range Adjust - Testing and Other Fun Information.txt b/Range Adjust - Testing and Other Fun Information.txt
index 2476aa7d7..3cb08c8f6 100644
--- a/Range Adjust - Testing and Other Fun Information.txt
+++ b/Range Adjust - Testing and Other Fun Information.txt
@@ -39,9 +39,15 @@ It's also just a pretty cool thing for modders generally speaking, both for givi
+Example of what the new .xml param-thing looks like:
+
+
+
+
Testing:
• Tested on a large variety of attacks, including weapon attacks and on all 5 species.
• Tested with having an absurdly high range_adjust value, and an absurdly low range_adjust value.
(Note: Having an absurdly low range-adjust value (i.e. one that makes the total range have a negative value) will cause the attack to always miss. This is because
- distance cannot be negative, so the distance between some guy and their opponent will always be more than the attack range value.)
\ No newline at end of file
+ distance cannot be negative, so the distance between some guy and their opponent will always be more than the attack range value. It should also be noted that these attacks,
+ like any that's not in range, can't be blocked.)
\ No newline at end of file
From 46789180e0dec2e48cdf4e1174de514acd362fc2 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Fri, 9 Aug 2024 16:07:50 +0200
Subject: [PATCH 17/26] Add files via upload
---
Source/Game/attackscript.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Source/Game/attackscript.cpp b/Source/Game/attackscript.cpp
index 6a83101ad..279756a57 100644
--- a/Source/Game/attackscript.cpp
+++ b/Source/Game/attackscript.cpp
@@ -196,12 +196,8 @@ void AttachAttackScriptGetter(ASContext *as_context) {
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetSharpDamage()", asMETHOD(AttackScriptGetter, GetSharpDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetDamage()", asMETHOD(AttackScriptGetter, GetDamage), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetForce()", asMETHOD(AttackScriptGetter, GetForce), asCALL_THISCALL);
-
- // Glimpse - Range Adjust
as_context->RegisterObjectMethod("AttackScriptGetter", "bool HasRangeAdjust()", asMETHOD(AttackScriptGetter, HasRangeAdjust), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "float GetRangeAdjust()", asMETHOD(AttackScriptGetter, GetRangeAdjust), asCALL_THISCALL);
- // Glimpse - Range Adjust
-
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMirrored()", asMETHOD(AttackScriptGetter, GetMirrored), asCALL_THISCALL);
as_context->RegisterObjectMethod("AttackScriptGetter", "int GetMobile()", asMETHOD(AttackScriptGetter, GetMobile), asCALL_THISCALL);
as_context->DocsCloseBrace();
From c140c111c33c110251aef23d0eb36873e3424cbe Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Fri, 9 Aug 2024 18:02:50 +0200
Subject: [PATCH 18/26] Add files via upload
---
...st - Testing and Other Fun Information.txt | 7 +++++++
...dhouse (big range - 101.5 to be exact).xml | 14 +++++++++++++
...dhouse (small range - 0.1 to be exact).xml | 14 +++++++++++++
spearslash.xml | 20 +++++++++++++++++++
spearslashclose.xml | 20 +++++++++++++++++++
spearstab.xml | 20 +++++++++++++++++++
spearstabfar.xml | 20 +++++++++++++++++++
spearsweep.xml | 20 +++++++++++++++++++
8 files changed, 135 insertions(+)
create mode 100644 roundhouse (big range - 101.5 to be exact).xml
create mode 100644 roundhouse (small range - 0.1 to be exact).xml
create mode 100644 spearslash.xml
create mode 100644 spearslashclose.xml
create mode 100644 spearstab.xml
create mode 100644 spearstabfar.xml
create mode 100644 spearsweep.xml
diff --git a/Range Adjust - Testing and Other Fun Information.txt b/Range Adjust - Testing and Other Fun Information.txt
index 3cb08c8f6..5d9240bc0 100644
--- a/Range Adjust - Testing and Other Fun Information.txt
+++ b/Range Adjust - Testing and Other Fun Information.txt
@@ -44,6 +44,13 @@ Example of what the new .xml param-thing looks like:
+Bonus Attatched:
+Some attack .xml files that have the range_adjust param. It's somewhat hard to tell the difference with the roundhouse.xmls, but with the spear attack .xmls (which all set the
+total range to some negative number) it's easy to tell that they're working as using a spear to fight someone else with a spear will result in both of your attacks
+constantly missing.
+
+
+
Testing:
• Tested on a large variety of attacks, including weapon attacks and on all 5 species.
diff --git a/roundhouse (big range - 101.5 to be exact).xml b/roundhouse (big range - 101.5 to be exact).xml
new file mode 100644
index 000000000..85121bd13
--- /dev/null
+++ b/roundhouse (big range - 101.5 to be exact).xml
@@ -0,0 +1,14 @@
+
+
+
+
+ Data/Attacks/reaction_highleft.xml
+
+
+
+
+
+ kick
+
\ No newline at end of file
diff --git a/roundhouse (small range - 0.1 to be exact).xml b/roundhouse (small range - 0.1 to be exact).xml
new file mode 100644
index 000000000..4f17a005c
--- /dev/null
+++ b/roundhouse (small range - 0.1 to be exact).xml
@@ -0,0 +1,14 @@
+
+
+
+
+ Data/Attacks/reaction_highleft.xml
+
+
+
+
+
+ kick
+
\ No newline at end of file
diff --git a/spearslash.xml b/spearslash.xml
new file mode 100644
index 000000000..36d5e6ec2
--- /dev/null
+++ b/spearslash.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ Data/Attacks/reaction_highright.xml
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spearslashclose.xml b/spearslashclose.xml
new file mode 100644
index 000000000..0c4f8dc5f
--- /dev/null
+++ b/spearslashclose.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ Data/Attacks/reaction_highright.xml
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spearstab.xml b/spearstab.xml
new file mode 100644
index 000000000..166253d4f
--- /dev/null
+++ b/spearstab.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ Data/Attacks/reaction_medfront.xml
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spearstabfar.xml b/spearstabfar.xml
new file mode 100644
index 000000000..6a741321e
--- /dev/null
+++ b/spearstabfar.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ Data/Attacks/reaction_medfront.xml
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spearsweep.xml b/spearsweep.xml
new file mode 100644
index 000000000..7217a6cc2
--- /dev/null
+++ b/spearsweep.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ Data/Attacks/reaction_lowright.xml
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 1e0557f9c3bd21c4dfe15cf84829b310f6bbe817 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:10 +0200
Subject: [PATCH 19/26] Delete Range Adjust - Testing and Other Fun
Information.txt
---
...st - Testing and Other Fun Information.txt | 60 -------------------
1 file changed, 60 deletions(-)
delete mode 100644 Range Adjust - Testing and Other Fun Information.txt
diff --git a/Range Adjust - Testing and Other Fun Information.txt b/Range Adjust - Testing and Other Fun Information.txt
deleted file mode 100644
index 5d9240bc0..000000000
--- a/Range Adjust - Testing and Other Fun Information.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-Changed Files:
-overgrowth-main\Source\Game\attackscript.h
-overgrowth-main\Source\Game\attackscript.cpp
-
-overgrowth-main\Source\Asset\Asset\attacks.h
-overgrowth-main\Source\Asset\Asset\attacks.cpp
-
-overgrowth-main\Data\Scripts\aschar.as
-
-
-
-Functionality:
-Allows one to add a param to an attacks .xml file that will increase or decrease the hitbox range of that attack.
-
-
-
-Implementation:
-An attack's .xml file can now have a new float param called "range_adjust".
-
-In the aschar.as file, whether or not an attack's .xml has this param can be gotten from attack_getter.HasRangeAdjust(), and the value of the param can be gotten from
-attack_getter.GetRangeAdjust().
-
-The first function just ensures that no problems are caused for the pre-existing .xml files that don't have this param.
-
-The value that the second function returns will be added to (or, I guess, subtracted from if the value is negative) the distance check performed in
-HandleAnimationCombatEvent(). This allows one to have finer control over how close the player (or any character) has to be to their opponent for a particular attack of
-theirs to hit.
-
-The reason I chose the method of adding to/subtracting from the range of an attack, instead of out-right overriding it, is because with this method it's really easy to look at an attack in-game and think "This could use a lil' bit more/less range." and so add or subtract from it respectively.
-
-Note: This only adjusts the *hitbox* range of a particular attack, and not from how far away someone must be to an opponent in order for an attack to trigger in the
-first place.
-
-
-
-Reason For Existing:
-Constance mentioned goofy range being a problem with the upper-cut attack in the Drowned Set she made for Ouruin - so this fixes that.
-It's also just a pretty cool thing for modders generally speaking, both for giving them more freedom and for balancing goofy hitboxes wherever they are.
-
-
-
-Example of what the new .xml param-thing looks like:
-
-
-
-
-Bonus Attatched:
-Some attack .xml files that have the range_adjust param. It's somewhat hard to tell the difference with the roundhouse.xmls, but with the spear attack .xmls (which all set the
-total range to some negative number) it's easy to tell that they're working as using a spear to fight someone else with a spear will result in both of your attacks
-constantly missing.
-
-
-
-Testing:
-• Tested on a large variety of attacks, including weapon attacks and on all 5 species.
-
-• Tested with having an absurdly high range_adjust value, and an absurdly low range_adjust value.
- (Note: Having an absurdly low range-adjust value (i.e. one that makes the total range have a negative value) will cause the attack to always miss. This is because
- distance cannot be negative, so the distance between some guy and their opponent will always be more than the attack range value. It should also be noted that these attacks,
- like any that's not in range, can't be blocked.)
\ No newline at end of file
From 78fab3d011bb9fa6dc66bf205dbc0d23edcc02b0 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:16 +0200
Subject: [PATCH 20/26] Delete roundhouse (big range - 101.5 to be exact).xml
---
roundhouse (big range - 101.5 to be exact).xml | 14 --------------
1 file changed, 14 deletions(-)
delete mode 100644 roundhouse (big range - 101.5 to be exact).xml
diff --git a/roundhouse (big range - 101.5 to be exact).xml b/roundhouse (big range - 101.5 to be exact).xml
deleted file mode 100644
index 85121bd13..000000000
--- a/roundhouse (big range - 101.5 to be exact).xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- Data/Attacks/reaction_highleft.xml
-
-
-
-
-
- kick
-
\ No newline at end of file
From 084bd876f793592ea057832db3c0f8c2eddb4343 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:21 +0200
Subject: [PATCH 21/26] Delete roundhouse (small range - 0.1 to be exact).xml
---
roundhouse (small range - 0.1 to be exact).xml | 14 --------------
1 file changed, 14 deletions(-)
delete mode 100644 roundhouse (small range - 0.1 to be exact).xml
diff --git a/roundhouse (small range - 0.1 to be exact).xml b/roundhouse (small range - 0.1 to be exact).xml
deleted file mode 100644
index 4f17a005c..000000000
--- a/roundhouse (small range - 0.1 to be exact).xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- Data/Attacks/reaction_highleft.xml
-
-
-
-
-
- kick
-
\ No newline at end of file
From 19c2c1eaa7d85838322c992a58432c142308c09e Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:25 +0200
Subject: [PATCH 22/26] Delete spearslash.xml
---
spearslash.xml | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 spearslash.xml
diff --git a/spearslash.xml b/spearslash.xml
deleted file mode 100644
index 36d5e6ec2..000000000
--- a/spearslash.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- Data/Attacks/reaction_highright.xml
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From b2d3a6ccfad4e5402a11b9fd562a421344835216 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:30 +0200
Subject: [PATCH 23/26] Delete spearslashclose.xml
---
spearslashclose.xml | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 spearslashclose.xml
diff --git a/spearslashclose.xml b/spearslashclose.xml
deleted file mode 100644
index 0c4f8dc5f..000000000
--- a/spearslashclose.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- Data/Attacks/reaction_highright.xml
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From e55c9f1e8925c7cac903628a5bf60015f02da472 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:35 +0200
Subject: [PATCH 24/26] Delete spearstab.xml
---
spearstab.xml | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 spearstab.xml
diff --git a/spearstab.xml b/spearstab.xml
deleted file mode 100644
index 166253d4f..000000000
--- a/spearstab.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- Data/Attacks/reaction_medfront.xml
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From bbd2c48938b8318110f2aeb4c95d7d0d63a51a30 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:40 +0200
Subject: [PATCH 25/26] Delete spearstabfar.xml
---
spearstabfar.xml | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 spearstabfar.xml
diff --git a/spearstabfar.xml b/spearstabfar.xml
deleted file mode 100644
index 6a741321e..000000000
--- a/spearstabfar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- Data/Attacks/reaction_medfront.xml
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 924ee7e198d296fb8b8bf9139aa495c5cc2dc288 Mon Sep 17 00:00:00 2001
From: Glimps3 <46634213+Glimps3@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:28:44 +0200
Subject: [PATCH 26/26] Delete spearsweep.xml
---
spearsweep.xml | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 spearsweep.xml
diff --git a/spearsweep.xml b/spearsweep.xml
deleted file mode 100644
index 7217a6cc2..000000000
--- a/spearsweep.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- Data/Attacks/reaction_lowright.xml
-
-
-
-
-
-
-
-
-
\ No newline at end of file