Beta2 patch level 6

Flags:
* fastspregen
* lowrodexfee
* batkmod
* summonfix
* marketfix
* critfix

1 files changed, 36 insertions, 14 deletions

diff --git a/localserver/beta.patch2 b/localserver/beta.patch2
index 4a310bb..d061a9b 100644
--- a/localserver/beta.patch2
+++ b/localserver/beta.patch2
@@ -1,8 +1,30 @@
+diff --git a/src/map/battle.c b/src/map/battle.c
+index 37fc03bca..e10291b1f 100644
+--- a/src/map/battle.c
++++ b/src/map/battle.c
+@@ -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))
+ 	{
+-		short cri = sstatus->cri;
++		int cri = sstatus->cri;
+ 		if (sd != NULL) {
+ 			// if show_katar_crit_bonus is enabled, it already done the calculation in status.c
+ 			if (!battle_config.show_katar_crit_bonus && sd->weapontype == W_KATAR) {
+@@ -4684,7 +4684,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
+ 		//Therefore, we use the old value 3 on cases when an sd gets attacked by a mob
+ 		cri -= tstatus->luk*(!sd&&tsd?3:2);
+ #else
+-		cri -= status->get_lv(target) / 15 + 2 * status_get_luk(target);
++		cri -= status->get_lv(target) / 5 + (3 * status_get_luk(target))/2;
+ #endif
+ 
+ 		if( tsc && tsc->data[SC_SLEEP] ) {
 diff --git a/src/map/npc.c b/src/map/npc.c
-index 4b79a9fed..b4d125581 100644
+index fea82c873..84d292415 100644
 --- a/src/map/npc.c
 +++ b/src/map/npc.c
-@@ -2069,9 +2069,6 @@ static int npc_buylist(struct map_session_data *sd, struct itemlist *item_list)
+@@ -2070,9 +2070,6 @@ static int npc_buylist(struct map_session_data *sd, struct itemlist *item_list)
  		w += itemdb_weight(entry->id) * entry->amount;
  	}
  
@@ -12,7 +34,7 @@ index 4b79a9fed..b4d125581 100644
  	if (z > sd->status.zeny)
  		return 1; // Not enough Zeny
  	if( w + sd->weight > sd->max_weight )
-@@ -2108,6 +2105,9 @@ static int npc_buylist(struct map_session_data *sd, struct itemlist *item_list)
+@@ -2109,6 +2106,9 @@ static int npc_buylist(struct map_session_data *sd, struct itemlist *item_list)
  		}
  	}
  
@@ -22,7 +44,7 @@ index 4b79a9fed..b4d125581 100644
  	return 0;
  }
  
-@@ -2178,6 +2178,9 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
+@@ -2179,6 +2179,9 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
  				return 1;
  		}
  
@@ -32,7 +54,7 @@ index 4b79a9fed..b4d125581 100644
  		z += (int64)value * entry->amount;
  		w += itemdb_weight(entry->id) * entry->amount;
  	}
-@@ -2217,6 +2220,9 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
+@@ -2218,6 +2221,9 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
  		}
  	}
  
@@ -42,7 +64,7 @@ index 4b79a9fed..b4d125581 100644
  	return 0;
  }
  
-@@ -2462,7 +2468,7 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
+@@ -2463,7 +2469,7 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
  
  	z = 0;
  
@@ -51,7 +73,7 @@ index 4b79a9fed..b4d125581 100644
  		return 1;
  
  	// verify the sell list
-@@ -2486,20 +2492,11 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
+@@ -2487,20 +2493,11 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
  			return 1;
  		}
  
@@ -72,7 +94,7 @@ index 4b79a9fed..b4d125581 100644
  	// delete items
  	for (i = 0; i < VECTOR_LENGTH(*item_list); i++) {
  		struct itemlist_entry *entry = &VECTOR_INDEX(*item_list, i);
-@@ -2518,7 +2515,7 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
+@@ -2519,7 +2516,7 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
  
  	}
  
@@ -81,7 +103,7 @@ index 4b79a9fed..b4d125581 100644
  		return 1;
  
  	if (z > MAX_ZENY)
-@@ -2539,6 +2536,10 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
+@@ -2540,6 +2537,10 @@ static int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
  		}
  	}
  
@@ -112,10 +134,10 @@ index 766fdc5ea..996576fd3 100644
  static struct rodex_interface rodex_s;
  struct rodex_interface *rodex;
 diff --git a/src/map/script.c b/src/map/script.c
-index 5211e2cd4..9880ed65b 100644
+index f515d4403..3747abd6e 100644
 --- a/src/map/script.c
 +++ b/src/map/script.c
-@@ -16436,6 +16436,8 @@ static BUILDIN(summon)
+@@ -16552,6 +16552,8 @@ static BUILDIN(summon)
  		clif->specialeffect(&md->bl,344,AREA);
  		sc_start4(NULL, &md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
  	}
@@ -125,10 +147,10 @@ index 5211e2cd4..9880ed65b 100644
  }
  
 diff --git a/src/map/status.c b/src/map/status.c
-index f06bb0330..1cd69ff18 100644
+index 63e71c9dc..b0fb430f7 100644
 --- a/src/map/status.c
 +++ b/src/map/status.c
-@@ -3552,7 +3552,7 @@ static void status_calc_regen(struct block_list *bl, struct status_data *st, str
+@@ -3553,7 +3553,7 @@ static void status_calc_regen(struct block_list *bl, struct status_data *st, str
  
  	regen->hp = cap_value(val, reg_flag, SHRT_MAX);
  
@@ -137,7 +159,7 @@ index f06bb0330..1cd69ff18 100644
  	if( st->int_ >= 120 )
  		val += ((st->int_-120)>>1) + 4;
  
-@@ -4468,17 +4468,23 @@ static unsigned short status_base_atk(const struct block_list *bl, const struct
+@@ -4469,17 +4469,23 @@ static int status_base_atk(const struct block_list *bl, const struct status_data
  		case W_SHOTGUN:
  		case W_GRENADE:
  			flag = 1;