Przeglądaj źródła

* Added PvP/GvG check for Tiger Knuckle fist
* Fixed Pressure reducing the target's SP twice
* Fixed SQL logging not checking if its supposed to use SQL or TXT logs

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1229 54d463be-8e91-2dee-dedb-b68131a5f0ec

celest 20 lat temu
rodzic
commit
2b17f6517b
3 zmienionych plików z 17 dodań i 5 usunięć
  1. 4 0
      Changelog-SVN.txt
  2. 2 3
      src/map/map.c
  3. 11 2
      src/map/skill.c

+ 4 - 0
Changelog-SVN.txt

@@ -1,6 +1,10 @@
 Date	Added
 
 03/13
+        * Added PvP/GvG check for Tiger Knuckle fist [celest]
+        * Fixed Pressure reducing the target's SP twice, thanks to deepin [celest]
+        * Fixed SQL logging not checking if its supposed to use SQL or TXT logs, thanks
+          to Alex14 [celest]
         * Fixed 23 new cards (some effects chances were divided by 100, some cards had no bonuses
 	  due to misplaced arguments, usage BONUS instead of BONUS2, etc) [Lupus]
 

+ 2 - 3
src/map/map.c

@@ -3402,9 +3402,8 @@ int do_init(int argc, char *argv[]) {
 	if(battle_config.mail_system)
 		do_init_mail();
 
-	if (log_config.branch || log_config.drop || log_config.mvpdrop ||
-		log_config.present || log_config.produce || log_config.refine ||
-		log_config.trade)
+	if (log_config.sql_logs && (log_config.branch || log_config.drop || log_config.mvpdrop ||
+		log_config.present || log_config.produce || log_config.refine || log_config.trade))
 	{
 		log_sql_init();
 	}

+ 11 - 2
src/map/skill.c

@@ -2194,7 +2194,7 @@ int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int s
 			sp = tsd->status.max_sp * 10 * skilllv / 100;
 			if (sp > tsd->status.sp) sp = tsd->status.sp;
 			tsd->status.sp -= sp;
-			pc_heal(tsd,0,-sp);
+			clif_updatestatus(tsd,SP_SP);
 		}
 		break;
 	case NPC_DARKBREATH:
@@ -2269,11 +2269,20 @@ int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int s
 		}
 		break;
 	case MO_COMBOFINISH:	/* –Ò—´Œ� */
-	case CH_TIGERFIST:		/* •šŒÕŒ� */
 	case CH_CHAINCRUSH:		/* ˜A’Œ•ö? */
 	case CH_PALMSTRIKE:		/* –ÒŒÕ�d”hŽR */
 		skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
 		break;
+	
+	case CH_TIGERFIST:		/* •šŒÕŒ� */
+		if (bl->type == BL_PC && !(map[bl->m].flag.gvg || map[bl->m].flag.pvp)) {
+			map_freeblock_unlock();
+			return 1;
+		}
+		skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
+		break;
+
+
 	case MO_EXTREMITYFIST:	/* ˆ¢�C—…”e–PŒ� */
 		{
 			struct status_change *sc_data = status_get_sc_data(src);