diff --git a/_work/data/Anims/Humans.mds.additions b/_work/data/Anims/Humans.mds.additions index e6358bb..e985851 100644 --- a/_work/data/Anims/Humans.mds.additions +++ b/_work/data/Anims/Humans.mds.additions @@ -1,7 +1,7 @@ // Additions to Humans.mds // // Place in between the two curly brackets: { { here } } -// Remember to delete the file _compiled\HUMANS.MSB (Gothic 2) or _compiled\HUMANS.MDH (Gothic 1) +// Remember to delete the file _compiled\HUMANS.MSB (Gothic 2) diff --git a/_work/data/Anims/MDS_Overlay/Humans_BowT2.mds.additions b/_work/data/Anims/MDS_Overlay/Humans_BowT2.mds.additions index 1a184d3..78ae53f 100644 --- a/_work/data/Anims/MDS_Overlay/Humans_BowT2.mds.additions +++ b/_work/data/Anims/MDS_Overlay/Humans_BowT2.mds.additions @@ -1,7 +1,7 @@ // Additions to Humans_BowT2.mds // // Place in between the two curly brackets: { { here } } -// Remember to delete the file _compiled\HUMANS_BOWT2.MSB (Gothic 2) or _compiled\HUMANS_BOWT2.MDH (Gothic 1) +// Remember to delete the file _compiled\HUMANS_BOWT2.MSB (Gothic 2) diff --git a/_work/data/Anims/MDS_Overlay/Humans_CBowT2.mds.additions b/_work/data/Anims/MDS_Overlay/Humans_CBowT2.mds.additions index 64beb5e..a52123e 100644 --- a/_work/data/Anims/MDS_Overlay/Humans_CBowT2.mds.additions +++ b/_work/data/Anims/MDS_Overlay/Humans_CBowT2.mds.additions @@ -1,7 +1,7 @@ // Additions to Humans_CBowT2.mds // // Place in between the two curly brackets: { { here } } -// Remember to delete the file _compiled\HUMANS_CBOWT2.MSB (Gothic 2) or _compiled\HUMANS_CBOWT2.MDH (Gothic 1) +// Remember to delete the file _compiled\HUMANS_CBOWT2.MSB (Gothic 2) diff --git a/_work/data/Scripts/Content/GFA/_intern/activate.d b/_work/data/Scripts/Content/GFA/_intern/activate.d index f9a7919..2a0e139 100644 --- a/_work/data/Scripts/Content/GFA/_intern/activate.d +++ b/_work/data/Scripts/Content/GFA/_intern/activate.d @@ -1,7 +1,7 @@ /* * Activate free aiming and set internal settings * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/aimRay.d b/_work/data/Scripts/Content/GFA/_intern/aimRay.d index 597c3be..4e7bd4e 100644 --- a/_work/data/Scripts/Content/GFA/_intern/aimRay.d +++ b/_work/data/Scripts/Content/GFA/_intern/aimRay.d @@ -1,7 +1,7 @@ /* * Aim-specific trace ray and focus collection * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/aimVob.d b/_work/data/Scripts/Content/GFA/_intern/aimVob.d index 956860a..15caf73 100644 --- a/_work/data/Scripts/Content/GFA/_intern/aimVob.d +++ b/_work/data/Scripts/Content/GFA/_intern/aimVob.d @@ -1,7 +1,7 @@ /* * Definition and manipulation of aim vob (targeting system) * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/auxiliary.d b/_work/data/Scripts/Content/GFA/_intern/auxiliary.d index cc433a0..97cd10e 100644 --- a/_work/data/Scripts/Content/GFA/_intern/auxiliary.d +++ b/_work/data/Scripts/Content/GFA/_intern/auxiliary.d @@ -1,7 +1,7 @@ /* * Auxiliary functions including finding the active spell instance and ranged weapon and offering animated reticles * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/ccommands.d b/_work/data/Scripts/Content/GFA/_intern/ccommands.d index dae9b58..fe91ec3 100644 --- a/_work/data/Scripts/Content/GFA/_intern/ccommands.d +++ b/_work/data/Scripts/Content/GFA/_intern/ccommands.d @@ -1,7 +1,7 @@ /* * Definition of all console commands * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/classes.d b/_work/data/Scripts/Content/GFA/_intern/classes.d index d9c0a35..7453fac 100644 --- a/_work/data/Scripts/Content/GFA/_intern/classes.d +++ b/_work/data/Scripts/Content/GFA/_intern/classes.d @@ -1,7 +1,7 @@ /* * GFA Classes * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/collectable.d b/_work/data/Scripts/Content/GFA/_intern/collectable.d index faf296b..c96eabd 100644 --- a/_work/data/Scripts/Content/GFA/_intern/collectable.d +++ b/_work/data/Scripts/Content/GFA/_intern/collectable.d @@ -1,7 +1,7 @@ /* * Collectable projectiles feature * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/collision.d b/_work/data/Scripts/Content/GFA/_intern/collision.d index 78f1cfe..a50feb9 100644 --- a/_work/data/Scripts/Content/GFA/_intern/collision.d +++ b/_work/data/Scripts/Content/GFA/_intern/collision.d @@ -1,7 +1,7 @@ /* * Custom projectile collision behaviors feature * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/const.d b/_work/data/Scripts/Content/GFA/_intern/const.d index 6e56690..192e926 100644 --- a/_work/data/Scripts/Content/GFA/_intern/const.d +++ b/_work/data/Scripts/Content/GFA/_intern/const.d @@ -1,7 +1,7 @@ /* * Internal constants of GFA * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. @@ -29,7 +29,7 @@ /* Initialization */ -const string GFA_VERSION = "Gothic Free Aim v1.0.0"; +const string GFA_VERSION = "Gothic Free Aim v1.0.1"; const int GFA_LEGO_FLAGS = LeGo_HookEngine // For initializing all hooks | LeGo_FrameFunctions // For projectile gravity | LeGo_ConsoleCommands // For console commands and debugging @@ -126,7 +126,7 @@ const int GFA_DRAWTIME_RELOAD = 1250; // Time (ms) for rel var int GFA_BowDrawOnset; // Time onset of drawing the bow var int GFA_MouseMovedLast; // Time of last mouse movement -const float GFA_SCATTER_HIT = 2.5; // (Visual angle)/2 within which everything is a hit +const float GFA_SCATTER_HIT = 1.5; // (Visual angle)/2 within which everything is a hit const float GFA_SCATTER_MISS = 4.2; // (Visual angle)/2 outside which everything is a miss const float GFA_SCATTER_MAX = 6.0; // (Visual angle)/2 of maximum scatter (all in degrees) diff --git a/_work/data/Scripts/Content/GFA/_intern/controls.d b/_work/data/Scripts/Content/GFA/_intern/controls.d index 3633a10..ba5adac 100644 --- a/_work/data/Scripts/Content/GFA/_intern/controls.d +++ b/_work/data/Scripts/Content/GFA/_intern/controls.d @@ -1,7 +1,7 @@ /* * Input and controls manipulation * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/criticalHit.d b/_work/data/Scripts/Content/GFA/_intern/criticalHit.d index 306fd99..cdf0e73 100644 --- a/_work/data/Scripts/Content/GFA/_intern/criticalHit.d +++ b/_work/data/Scripts/Content/GFA/_intern/criticalHit.d @@ -1,7 +1,7 @@ /* * Critical hit detection for ranged combat * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/externals_G1.d b/_work/data/Scripts/Content/GFA/_intern/externals_G1.d index eb92e2e..093a590 100644 --- a/_work/data/Scripts/Content/GFA/_intern/externals_G1.d +++ b/_work/data/Scripts/Content/GFA/_intern/externals_G1.d @@ -1,7 +1,7 @@ /* * Constants and (external) functions that do not exist in Gothic 1 * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/init.d b/_work/data/Scripts/Content/GFA/_intern/init.d index 1295e1a..b524fb6 100644 --- a/_work/data/Scripts/Content/GFA/_intern/init.d +++ b/_work/data/Scripts/Content/GFA/_intern/init.d @@ -1,7 +1,7 @@ /* * Initialization of GFA * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/offsets_G1.d b/_work/data/Scripts/Content/GFA/_intern/offsets_G1.d index 757ea57..2a6c0e5 100644 --- a/_work/data/Scripts/Content/GFA/_intern/offsets_G1.d +++ b/_work/data/Scripts/Content/GFA/_intern/offsets_G1.d @@ -1,7 +1,7 @@ /* * Engine offsets for Gothic 1 * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/offsets_G2.d b/_work/data/Scripts/Content/GFA/_intern/offsets_G2.d index 4ee1bfc..3b30314 100644 --- a/_work/data/Scripts/Content/GFA/_intern/offsets_G2.d +++ b/_work/data/Scripts/Content/GFA/_intern/offsets_G2.d @@ -1,7 +1,7 @@ /* * Engine offsets for Gothic 2 * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/rangedAiming.d b/_work/data/Scripts/Content/GFA/_intern/rangedAiming.d index 2cab68a..5002af8 100644 --- a/_work/data/Scripts/Content/GFA/_intern/rangedAiming.d +++ b/_work/data/Scripts/Content/GFA/_intern/rangedAiming.d @@ -1,7 +1,7 @@ /* * Free aiming mechanics for ranged combat aiming * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d b/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d index 3efa01a..9b4a45f 100644 --- a/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d +++ b/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d @@ -1,7 +1,7 @@ /* * Free aiming mechanics for ranged combat shooting * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. @@ -235,7 +235,7 @@ func void GFA_SetupProjectile() { var int accuracy; accuracy = GFA_GetAccuracy_(); // Change the accuracy in that function, not here! // Determine whether it is considered accurate enough for a positive hit - if (r_MinMax(0, 99) < accuracy) { + if (r_Max(99) < accuracy) { // The projectile will land inside the hit radius scaled by the accuracy rmin = FLOATNULL; @@ -244,12 +244,12 @@ func void GFA_SetupProjectile() { var int hitRadius; hitRadius = castToIntf(GFA_SCATTER_HIT); var int hitArea; hitArea = mulf(PI, sqrf(hitRadius)); // Area of circle from radius - // Scale the maximum area with minimum acurracy + // Scale the maximum area with minimum accuracy // (hitArea - 1) * (accuracy - 100) // -------------------------------- + 1 // -100 var int maxArea; - maxArea = addf(divf(mulf(subf(hitArea, FLOATONE), mkf(accuracy-100)), negf(FLOAT1C)), FLOATONE); + maxArea = addf(divf(mulf(subf(hitArea, FLOATONE), mkf(100-accuracy)), FLOAT1C), FLOATONE); // Convert back to a radius rmax = sqrtf(divf(maxArea, PI)); @@ -267,8 +267,8 @@ func void GFA_SetupProjectile() { // r_MinMax works with integers: scale up var int rmaxI; rmaxI = roundf(mulf(rmax, FLOAT1K)); - // Azimiuth scatter (horizontal deviation from a perfect shot in degrees) - var int angleX; angleX = fracf(r_MinMax(FLOATNULL, rmaxI), 1000); // Here the 1000 are scaled down again + // Azimuth scatter (horizontal deviation from a perfect shot in degrees) + var int angleX; angleX = fracf(r_Max(rmaxI), 1000); // Here the 1000 are scaled down again // For a circular scattering pattern the range of possible values (rmin and rmax) for angleY is decreased: // r^2 - x^2 = y^2 => y = sqrt(r^2 - x^2), where r is the radius to stay within the maximum radius diff --git a/_work/data/Scripts/Content/GFA/_intern/reticle.d b/_work/data/Scripts/Content/GFA/_intern/reticle.d index 5ea4110..c27c87d 100644 --- a/_work/data/Scripts/Content/GFA/_intern/reticle.d +++ b/_work/data/Scripts/Content/GFA/_intern/reticle.d @@ -1,7 +1,7 @@ /* * Reticle handling * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/spell.d b/_work/data/Scripts/Content/GFA/_intern/spell.d index 2876b29..a5a5f8c 100644 --- a/_work/data/Scripts/Content/GFA/_intern/spell.d +++ b/_work/data/Scripts/Content/GFA/_intern/spell.d @@ -1,7 +1,7 @@ /* * Free aiming mechanics for spell combat * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/_intern/strafing.d b/_work/data/Scripts/Content/GFA/_intern/strafing.d index ed65d3e..8c32b86 100644 --- a/_work/data/Scripts/Content/GFA/_intern/strafing.d +++ b/_work/data/Scripts/Content/GFA/_intern/strafing.d @@ -1,7 +1,7 @@ /* * Movement during free aiming * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/Content/GFA/config/collectable.d b/_work/data/Scripts/Content/GFA/config/collectable.d index 76d0dde..8febda8 100644 --- a/_work/data/Scripts/Content/GFA/config/collectable.d +++ b/_work/data/Scripts/Content/GFA/config/collectable.d @@ -20,13 +20,8 @@ func int GFA_GetUsedProjectileInstance(var int projectileInst, var C_Npc shooter, var C_Npc inventoryNpc) { /* // Exchange the projectile with a 'used' one (e.g. arrow, that needs to be repaired) - if (projectileInst == Hlp_GetInstanceID(ItRw_Arrow)) { // ItAmArrow in Gothic 1 - if (!Hlp_IsValidItem(ItRw_UsedArrow)) { - // Initialize! It is important, that the item instance is valid (must have been created before), otherwise - // its value is -1. To ensure this, create the item once at way point 'TOT'. - Wld_InsertItem(ItRw_UsedArrow, MEM_FARFARAWAY); - }; - projectileInst = Hlp_GetInstanceID(ItRw_UsedArrow); + if (projectileInst == ItRw_Arrow) { // ItAmArrow in Gothic 1 + projectileInst = ItRw_UsedArrow; }; */ // Remove magical arrows/bolts from Gothic 2 Addon (if re-usable, they would be overpowered) diff --git a/_work/data/Scripts/Content/GFA/config/ranged.d b/_work/data/Scripts/Content/GFA/config/ranged.d index 75151ab..bdc8d39 100644 --- a/_work/data/Scripts/Content/GFA/config/ranged.d +++ b/_work/data/Scripts/Content/GFA/config/ranged.d @@ -72,23 +72,23 @@ func int GFA_GetDrawForce(var C_Item weapon, var int talent) { func int GFA_GetAccuracy(var C_Item weapon, var int talent) { // Here, the 'hit chance' is scaled by draw force, where 'hit chance' is talent (Gothic 2) or dexterity (Gothic 1) // Draw force = 100% -> accuracy = hit chance - // Draw force = 0% -> accuracy = hit chance * 0.75 + // Draw force = 0% -> accuracy = hit chance * 0.8 // In Gothic 1, the hit chance is actually the dexterity (for both bows and crossbows), NOT the talent! if (GOTHIC_BASE_VERSION == 1) { talent = hero.attribute[ATR_DEXTERITY]; }; - // Get draw force from the function above and re-scale it from [0, 100] to [75, 100] + // Get draw force from the function above and re-scale it from [0, 100] to [80, 100] var int drawForce; drawForce = GFA_GetDrawForce(weapon, talent); - drawForce = GFA_ScaleRanges(drawForce, 0, 100, 75, 100); + drawForce = GFA_ScaleRanges(drawForce, 0, 100, 80, 100); // Scale accuracy by draw force var int accuracy; accuracy = (talent * drawForce) / 100; - // Decrease accuracy if moving by 0.25 + // Decrease accuracy if moving by 0.2 if (GFA_IsStrafing) { - accuracy = accuracy*3/4; + accuracy = accuracy*(4/5); }; return accuracy; @@ -119,9 +119,9 @@ func int GFA_GetRecoil(var C_Item weapon, var int talent) { var int scaledStrength; scaledStrength = hero.attribute[ATR_STRENGTH]; scaledStrength = GFA_ScaleRanges(scaledStrength, 20, 120, 0, 80); - // Get draw force (steady aim) from the function above and re-scale it from [0, 100] to [75, 100] + // Get draw force (steady aim) from the function above and re-scale it from [0, 100] to [80, 100] var int steadyAim; steadyAim = GFA_GetDrawForce(weapon, talent); - steadyAim = GFA_ScaleRanges(steadyAim, 0, 100, 75, 100); + steadyAim = GFA_ScaleRanges(steadyAim, 0, 100, 80, 100); // Apply steady aim to scaled strength and inverse result to obtain recoil percentage var int recoil; recoil = (scaledStrength * steadyAim) / 100; @@ -153,7 +153,7 @@ func int GFA_GetInitialBaseDamage(var int baseDamage, var int damageType, var C_ var int aimingDistance) { // Here the damage is scaled by draw force: // Draw force = 100% -> baseDamage - // Draw force = 0% -> baseDamage * 0.75 + // Draw force = 0% -> baseDamage * 0.8 /* // Optionally, it is possible to exclude certain damage types @@ -162,9 +162,9 @@ func int GFA_GetInitialBaseDamage(var int baseDamage, var int damageType, var C_ return baseDamage; }; */ - // Get draw force from the function above and re-scale it from [0, 100] to [75, 100] + // Get draw force from the function above and re-scale it from [0, 100] to [80, 100] var int drawForce; drawForce = GFA_GetDrawForce(weapon, talent); - drawForce = GFA_ScaleRanges(drawForce, 0, 100, 75, 100); + drawForce = GFA_ScaleRanges(drawForce, 0, 100, 80, 100); // Scale initial damage with adjusted draw force baseDamage = (baseDamage * drawForce) / 100; diff --git a/_work/data/Scripts/System/Camera/CamInstGFA.d b/_work/data/Scripts/System/Camera/CamInstGFA.d index 42aa253..01113d1 100644 --- a/_work/data/Scripts/System/Camera/CamInstGFA.d +++ b/_work/data/Scripts/System/Camera/CamInstGFA.d @@ -1,7 +1,7 @@ /* * Free aim camera mode * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/System/Menu/Menu_Opt_Game_GFA.d b/_work/data/Scripts/System/Menu/Menu_Opt_Game_GFA.d index 0954bf4..9d89b2c 100644 --- a/_work/data/Scripts/System/Menu/Menu_Opt_Game_GFA.d +++ b/_work/data/Scripts/System/Menu/Menu_Opt_Game_GFA.d @@ -1,7 +1,7 @@ /* * Free aim menu options * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/System/PFX/PfxInstGFA_G1.d b/_work/data/Scripts/System/PFX/PfxInstGFA_G1.d index e244966..44314a8 100644 --- a/_work/data/Scripts/System/PFX/PfxInstGFA_G1.d +++ b/_work/data/Scripts/System/PFX/PfxInstGFA_G1.d @@ -1,7 +1,7 @@ /* * Projectile trail strip for increased visibility * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/System/PFX/PfxInstGFA_G2.d b/_work/data/Scripts/System/PFX/PfxInstGFA_G2.d index e8dff4d..cd4956b 100644 --- a/_work/data/Scripts/System/PFX/PfxInstGFA_G2.d +++ b/_work/data/Scripts/System/PFX/PfxInstGFA_G2.d @@ -1,7 +1,7 @@ /* * Projectile trail strip for increased visibility * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/System/SFX/SfxInstGFA.d b/_work/data/Scripts/System/SFX/SfxInstGFA.d index cfa8909..e2a1e2b 100644 --- a/_work/data/Scripts/System/SFX/SfxInstGFA.d +++ b/_work/data/Scripts/System/SFX/SfxInstGFA.d @@ -1,7 +1,7 @@ /* * Critical hit sound for projectiles * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim. diff --git a/_work/data/Scripts/System/VisualFX/VisualFxInstGFA.d b/_work/data/Scripts/System/VisualFX/VisualFxInstGFA.d index ea816c3..7740552 100644 --- a/_work/data/Scripts/System/VisualFX/VisualFxInstGFA.d +++ b/_work/data/Scripts/System/VisualFX/VisualFxInstGFA.d @@ -1,7 +1,7 @@ /* * Projectile trail strip for increased visibility * - * Gothic Free Aim (GFA) v1.0.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes + * Gothic Free Aim (GFA) v1.0.1 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes * Copyright (C) 2016-2017 mud-freak (@szapp) * * This file is part of Gothic Free Aim.