Przeglądaj źródła

- script command "isrefine" will no longer return always false for equip positions above 6 (this has not been needed since the addition of the refine column to tbe item_db many months ago)
- Added NPC_CRITICALSLASH to the list of skills that display as a normal attack.
- Changed the default of clear_skills_on_death to 0


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

skotlex 19 lat temu
rodzic
commit
f3687369e6

+ 5 - 0
Changelog-Trunk.txt

@@ -4,6 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/08/24
+	* script command "isrefine" will no longer return always false for equip
+	  positions above 6 (this has not been needed since the addition of the
+	  refine column to tbe item_db many months ago) [Skotlex]
+	* Added NPC_CRITICALSLASH to the list of skills that display as a normal
+	  attack. [Skotlex]
 	* Reverted the previous change, changed the pet capture code to try to
 	  capture a mob based on their view class rather than actual class.
 	  [Skotlex]

+ 1 - 0
conf-tmpl/Changelog.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 2006/08/24
+	* Changed the default of clear_skills_on_death to 0 [Skotlex]
 	* Added setting clear_skills_on_warp to specify when a character's
 	  land-based skills are deleted when the caster changes maps. Defaults to all
 	  types (skill.conf). [Skotlex]

+ 1 - 0
conf-tmpl/atcommand_athena.conf

@@ -314,6 +314,7 @@ questskill: 40
 
 // Sets the speed you can walk/attack at. Default is 150.
 speed: 40
+charspeed: 40
 
 // Enables spirit sphere balls.
 spiritball: 40

+ 1 - 1
conf-tmpl/battle/skill.conf

@@ -87,7 +87,7 @@ skillrange_from_weapon: 14
 skill_caster_check: yes
 
 // Should ground placed skills be removed as soon as the caster dies? [Note 4]
-clear_skills_on_death: 15
+clear_skills_on_death: 0
 
 // Should ground placed skills be removed when the caster changes maps? [Note 4]
 clear_skills_on_warp: 15

+ 1 - 1
src/map/script.c

@@ -6035,7 +6035,7 @@ int buildin_getequipisenableref(struct script_state *st)
 	num=conv_num(st,& (st->stack->stack_data[st->start+2]));
 	sd=script_rid2sd(st);
 	i=pc_checkequip(sd,equip[num-1]);
-	if(i >= 0 && num<7 && sd->inventory_data[i] && !sd->inventory_data[i]->flag.no_refine)
+	if(i >= 0 && sd->inventory_data[i] && !sd->inventory_data[i]->flag.no_refine)
 	{
 		push_val(st->stack,C_INT,1);
 	} else {

+ 4 - 2
src/map/skill.c

@@ -2028,13 +2028,15 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 	case PA_GOSPEL: //Should look like Holy Cross [Skotlex]
 		dmg.dmotion = clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, CR_HOLYCROSS, -1, 5);
 		break;
-	//Skills who's damage should't show any skill-animation.
+	//Skills that need be passed as a normal attack for the client to display correctly.
 	case HVAN_EXPLOSION:
 	case NPC_SELFDESTRUCTION:
 		if(src->type==BL_PC)
 			dmg.blewcount = 10;
 		dmg.amotion = 0; //Disable delay or attack will do no damage since source is dead by the time it takes effect. [Skotlex]
-	case KN_AUTOCOUNTER: //Skills that need be passed as a normal attack for the client to display correctly.
+
+	case KN_AUTOCOUNTER:
+	case NPC_CRITICALSLASH:
 	case TF_DOUBLE:
 	case GS_CHAINACTION:
 	case SN_SHARPSHOOTING: