@@ -56,8 +56,9 @@ public static void EmitGeneralSkill(TSPlayer Player, SkillContext skill)
56
56
}
57
57
58
58
59
- internal static void CycleAdapr ( TSPlayer ply , Vector2 vel , Vector2 pos , ProjectileOption option , NPC ? lockNpc = null )
59
+ internal static void CycleAdapr ( TSPlayer ply , Vector2 vel , Vector2 pos , ProjectileOption option , float Damage , NPC ? lockNpc = null )
60
60
{
61
+ var damage = option . DynamicDamage ? Damage / ply . SelectedItem . damage * option . Damage : Damage ;
61
62
foreach ( var opt in option . ProjectileCycle . ProjectileCycles )
62
63
{
63
64
var _vel = vel ;
@@ -100,7 +101,7 @@ internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, Projecti
100
101
_pos ,
101
102
_vel * ( opt . Reverse ? - 1 : 1 ) ,
102
103
option . ID ,
103
- option . Damage ,
104
+ Convert . ToInt32 ( Damage ) ,
104
105
option . Knockback ,
105
106
ply . Index ,
106
107
option . AI [ 0 ] ,
@@ -141,7 +142,7 @@ internal static void CycleAdapr(TSPlayer ply, Vector2 vel, Vector2 pos, Projecti
141
142
/// <param name="skill"></param>
142
143
/// <param name="vel"></param>
143
144
/// <param name="pos"></param>
144
- public static void SpawnSkillProjectile ( TSPlayer Player , SkillContext skill , Vector2 vel , Vector2 pos )
145
+ public static void SpawnSkillProjectile ( TSPlayer Player , SkillContext skill , Vector2 vel , Vector2 pos , int Damage )
145
146
{
146
147
EmitGeneralSkill ( Player , skill ) ;
147
148
foreach ( var i in Enumerable . Range ( 0 , skill . Projectiles . Count ) )
@@ -166,7 +167,7 @@ public static void SpawnSkillProjectile(TSPlayer Player, SkillContext skill, Vec
166
167
}
167
168
}
168
169
}
169
- CycleAdapr ( Player , vel , pos , proj , lockNpc ) ;
170
+ CycleAdapr ( Player , vel , pos , proj , Damage , lockNpc ) ;
170
171
} ) . AddMilliSeconds ( proj . Dealy * i ) ;
171
172
}
172
173
}
@@ -181,7 +182,7 @@ public static void EmitSkill(TSPlayer Player, SkillContext skill)
181
182
var pos = Player . TPlayer . Center + Player . TPlayer . ItemOffSet ( ) ;
182
183
//原始角度速度参数
183
184
var vel = Player . TPlayer . ItemOffSet ( ) ;
184
- SpawnSkillProjectile ( Player , skill , vel , pos ) ;
185
+ SpawnSkillProjectile ( Player , skill , vel , pos , Player . SelectedItem . damage ) ;
185
186
Interpreter . ExecuteScript ( skill , Player , pos , vel ) ;
186
187
}
187
188
@@ -191,7 +192,7 @@ public static void EmitSkill(GetDataHandlers.NewProjectileEventArgs e, SkillCont
191
192
var pos = e . Position ;
192
193
//原始角度速度参数
193
194
var vel = e . Velocity ;
194
- SpawnSkillProjectile ( e . Player , skill , vel , pos ) ;
195
+ SpawnSkillProjectile ( e . Player , skill , vel , pos , e . Damage ) ;
195
196
Interpreter . ExecuteScript ( skill , e . Player , pos , vel ) ;
196
197
}
197
198
}
0 commit comments