summaryrefslogtreecommitdiff
path: root/.tools/beta.patch2
diff options
context:
space:
mode:
Diffstat (limited to '.tools/beta.patch2')
-rw-r--r--.tools/beta.patch235
1 files changed, 33 insertions, 2 deletions
diff --git a/.tools/beta.patch2 b/.tools/beta.patch2
index 80ee2077b..8a6895b51 100644
--- a/.tools/beta.patch2
+++ b/.tools/beta.patch2
@@ -1,5 +1,5 @@
diff --git a/src/map/battle.c b/src/map/battle.c
-index 37fc03bca..155d8cdd2 100644
+index 37fc03bca..eb96f2036 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -372,7 +372,7 @@ static int64 battle_attr_fix(struct block_list *src, struct block_list *target,
@@ -11,6 +11,24 @@ index 37fc03bca..155d8cdd2 100644
if (sc && sc->count) {
if(sc->data[SC_VOLCANO] && atk_elem == ELE_FIRE)
ratio += skill->enchant_eff[sc->data[SC_VOLCANO]->val1-1];
+@@ -1426,7 +1426,7 @@ static int64 battle_calc_defense(int attack_type, struct block_list *src, struct
+ **/
+
+ if( def1 < -399 ) // it stops at -399
+- def1 = 399; // in aegis it set to 1 but in our case it may lead to exploitation so limit it to 399
++ def1 = -399; // in aegis it set to 1 but in our case it may lead to exploitation so limit it to 399
+ //return 1;
+
+ if( flag&2 )
+@@ -1481,7 +1481,7 @@ static int64 battle_calc_defense(int attack_type, struct block_list *src, struct
+ * RE MDEF Reduction
+ **/
+ if( mdef < -99 ) // it stops at -99
+- mdef = 99; // in aegis it set to 1 but in our case it may lead to exploitation so limit it to 99
++ mdef = -99; // in aegis it set to 1 but in our case it may lead to exploitation so limit it to 99
+ //return 1;
+
+ damage = (int)((100.0f - mdef / (mdef + 100.0f) * 90.0f) / 100.0f * damage - mdef2);
@@ -4664,7 +4664,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
skill_id == SN_SHARPSHOOTING || skill_id == MA_SHARPSHOOTING ||
skill_id == NJ_KIRIKAGE))
@@ -156,7 +174,7 @@ index f515d4403..3747abd6e 100644
}
diff --git a/src/map/status.c b/src/map/status.c
-index 63e71c9dc..b0fb430f7 100644
+index 63e71c9dc..9a235e5e3 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4469,17 +4469,23 @@ static int status_base_atk(const struct block_list *bl, const struct status_data
@@ -185,3 +203,16 @@ index 63e71c9dc..b0fb430f7 100644
#endif
//Normally only players have base-atk, but homunc have a different batk
// equation, hinting that perhaps non-players should use this for batk.
+@@ -6124,6 +6130,12 @@ static short status_calc_aspd(struct block_list *bl, struct status_change *sc, s
+ static short status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, int aspd)
+ {
+ nullpo_ret(bl);
++
++ // TMW2 Nerfing
++ if (aspd < 300)
++ aspd=cap_value(aspd+(aspd / 2), 0, 300);
++
++ // Status Conditions
+ if (!sc || !sc->count)
+ return cap_value(aspd, 0, 2000);
+