Changeset 1511

User picture

Author: ATracer

(2010/03/13 16:16) Almost 2 years ago

[Skill engine] added several missing effects for Break Power, Divine Chastisement, Chastisement of Darkness, Divine Strike, Immortal Blessing, Prayer of Restoration, Salvation, Pandaemonium's Protection,
Sympathetic Heal, Tremor

Affected files

Updated trunk/AE-go_GameServer/data/static_data/skills/skills.xsd Download diff

15101511
30
			<xs:element name="actions" type="Actions" minOccurs="0"
30
			<xs:element name="actions" type="Actions" minOccurs="0"
31
				maxOccurs="1" />
31
				maxOccurs="1" />
32
		</xs:sequence>
32
		</xs:sequence>
 
33
		<xs:attribute name="penalty_skill_id" type="skillId"/>



33
		<xs:attribute name="skill_id" type="skillId" use="required" />
34
		<xs:attribute name="skill_id" type="skillId" use="required" />



34
		<xs:attribute name="name" type="xs:string" />
35
		<xs:attribute name="name" type="xs:string" />



35
		<xs:attribute name="nameId" type="xs:int" />
36
		<xs:attribute name="nameId" type="xs:int" />





          

  Updated
trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/effect/EffectTemplate.java  Download diff




      
      
15101511
170
		effect.setSubEffect(newEffect);
170
		effect.setSubEffect(newEffect);



171
	}
171
	}



172
	
172
	



173
	



173
	/**
174
	/**



174
	 * 
175
	 * 



175
	 * @param effect
176
	 * @param effect





          

  Updated
trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/model/Effect.java  Download diff




      
      
15101511
535
		stopTasks();
535
		stopTasks();



536
	}
536
	}



537
537



538
	/**



539
	 * Stop all scheduled tasks



540
	 */



538
	public void stopTasks()
541
	public void stopTasks()



539
	{
542
	{



540
		if(task != null)
543
		if(task != null)





          

  Updated
trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/model/Skill.java  Download diff




      
      
15101511
26
import com.aionemu.gameserver.network.aion.serverpackets.SM_CASTSPELL;
26
import com.aionemu.gameserver.network.aion.serverpackets.SM_CASTSPELL;



27
import com.aionemu.gameserver.network.aion.serverpackets.SM_CASTSPELL_END;
27
import com.aionemu.gameserver.network.aion.serverpackets.SM_CASTSPELL_END;



28
import com.aionemu.gameserver.restrictions.RestrictionsManager;
28
import com.aionemu.gameserver.restrictions.RestrictionsManager;



29
import com.aionemu.gameserver.skillengine.SkillEngine;



29
import com.aionemu.gameserver.skillengine.action.Action;
30
import com.aionemu.gameserver.skillengine.action.Action;



30
import com.aionemu.gameserver.skillengine.action.Actions;
31
import com.aionemu.gameserver.skillengine.action.Actions;



31
import com.aionemu.gameserver.skillengine.condition.Condition;
32
import com.aionemu.gameserver.skillengine.condition.Condition;


...
...
148
	}
149
	}



149
	
150
	



150
	/**
151
	/**



152
	 * Penalty success skill



153
	 */



154
	private void startPenaltySkill()



155
	{



156
		if(skillTemplate.getPenaltySkillId() == 0)



157
			return;



158
		



159
		Skill skill = SkillEngine.getInstance().getSkill((Player) effector, skillTemplate.getPenaltySkillId(), 1, firstTarget); 



160
		skill.useSkill();



161
	}



162
	



163
	/**



151
	 *  Start casting of skill
164
	 *  Start casting of skill



152
	 */
165
	 */



153
	private void startCast()
166
	private void startCast()


...
...
221
		{
234
		{



222
			effect.applyEffect();
235
			effect.applyEffect();



223
		}
236
		}



237
		



238
		/**



239
		 * Use penalty skill (now 100% success)



240
		 */



241
		startPenaltySkill();



224
	}
242
	}



225
	
243
	



226
	/**
244
	/**





          

  Updated
trunk/AE-go_GameServer/src/com/aionemu/gameserver/skillengine/model/SkillTemplate.java  Download diff




      
      
15101511
72
    protected int duration;
72
    protected int duration;



73
    @XmlAttribute
73
    @XmlAttribute



74
    protected Integer cooldown;
74
    protected Integer cooldown;



75
    @XmlAttribute(name = "penalty_skill_id")



76
    protected int penaltySkillId;



75
77



76
    /**
78
    /**



77
	 * @return the initProperties
79
	 * @return the initProperties


...
...
282
        }
284
        }



283
    }
285
    }



284
286



287
	/**



288
	 * @return the penaltySkillId



289
	 */



290
	public int getPenaltySkillId()



291
	{



292
		return penaltySkillId;



293
	}



294



285
}
295
}