From 2281816109b81a81417fa1c3271279b93d0989f9 Mon Sep 17 00:00:00 2001
From: xban1x <urban.lavbic@gmail.com>
Date: Tue, 27 Aug 2013 19:46:54 +0000
Subject: [PATCH] BETA: DP-Part for [L6192] * Reviewed by: Nos
---
.../data/scripts/ai/individual/Antharas.java | 24 +++++++++----------
.../data/scripts/ai/individual/Baium.java | 12 +++++-----
.../game/data/scripts/ai/individual/Core.java | 12 +++++-----
.../data/scripts/ai/individual/Orfen.java | 12 +++++-----
.../data/scripts/ai/individual/QueenAnt.java | 12 +++++-----
.../data/scripts/ai/individual/Valakas.java | 12 +++++-----
.../scripts/ai/individual/Venom/Venom.java | 2 +-
.../data/scripts/ai/individual/Zaken.java | 12 +++++-----
.../handlers/bypasshandlers/Festival.java | 6 ++---
.../handlers/effecthandlers/Bluff.java | 2 +-
.../handlers/effecthandlers/CallPc.java | 4 ++--
.../handlers/effecthandlers/Confuse.java | 2 +-
.../handlers/effecthandlers/DamOverTime.java | 2 +-
.../effecthandlers/DamOverTimePercent.java | 2 +-
.../handlers/effecthandlers/DeleteHate.java | 2 +-
.../effecthandlers/DeleteHateOfMe.java | 2 +-
.../effecthandlers/DispelByCategory.java | 4 ++--
.../DispelBySlotProbability.java | 2 +-
.../handlers/effecthandlers/Lethal.java | 4 ++--
.../effecthandlers/RandomizeHate.java | 2 +-
.../handlers/effecthandlers/Restoration.java | 4 ++--
.../handlers/effecthandlers/SetSkill.java | 4 ++--
.../handlers/effecthandlers/SkillTurning.java | 2 +-
.../handlers/effecthandlers/SoulEating.java | 4 ++--
.../effecthandlers/StealAbnormal.java | 4 ++--
.../handlers/effecthandlers/SummonCubic.java | 12 +++++-----
.../handlers/effecthandlers/SummonNpc.java | 10 ++++----
.../handlers/effecthandlers/SummonTrap.java | 4 ++--
.../handlers/effecthandlers/TargetCancel.java | 2 +-
.../effecthandlers/TargetMeProbability.java | 2 +-
.../handlers/effecthandlers/Teleport.java | 2 +-
.../handlers/effecthandlers/TransferHate.java | 2 +-
.../effecthandlers/TriggerSkillByDamage.java | 20 ++++++++--------
.../Q00261_CollectorsDream.java | 4 ++--
.../Q00281_HeadForTheHills.java | 6 ++---
35 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
index 1412cb818e..983a7ed1fa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
@@ -222,12 +222,12 @@ public class Antharas extends AbstractNpcAI
}
else if (status == FIGHTING)
{
- int loc_x = info.getInteger("loc_x");
- int loc_y = info.getInteger("loc_y");
- int loc_z = info.getInteger("loc_z");
- int heading = info.getInteger("heading");
- int hp = info.getInteger("currentHP");
- int mp = info.getInteger("currentMP");
+ int loc_x = info.getInt("loc_x");
+ int loc_y = info.getInt("loc_y");
+ int loc_z = info.getInt("loc_z");
+ int heading = info.getInt("heading");
+ int hp = info.getInt("currentHP");
+ int mp = info.getInt("currentMP");
_antharas = (L2GrandBossInstance) addSpawn(ANTHARAS_OLD_ID, loc_x, loc_y, loc_z, heading, false, 0);
GrandBossManager.getInstance().addBoss(_antharas);
_antharas.setCurrentHpMp(hp, mp);
@@ -268,12 +268,12 @@ public class Antharas extends AbstractNpcAI
if ((antharasId != 0) && (status == FIGHTING))
{
StatsSet info = GrandBossManager.getInstance().getStatsSet(antharasId);
- int loc_x = info.getInteger("loc_x");
- int loc_y = info.getInteger("loc_y");
- int loc_z = info.getInteger("loc_z");
- int heading = info.getInteger("heading");
- int hp = info.getInteger("currentHP");
- int mp = info.getInteger("currentMP");
+ int loc_x = info.getInt("loc_x");
+ int loc_y = info.getInt("loc_y");
+ int loc_z = info.getInt("loc_z");
+ int heading = info.getInt("heading");
+ int hp = info.getInt("currentHP");
+ int mp = info.getInt("currentMP");
_antharas = (L2GrandBossInstance) addSpawn(antharasId, loc_x, loc_y, loc_z, heading, false, 0);
GrandBossManager.getInstance().addBoss(_antharas);
_antharas.setCurrentHpMp(hp, mp);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
index 7dc274f8a2..3e5685f88f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Baium.java
@@ -136,12 +136,12 @@ public class Baium extends AbstractNpcAI
}
else if (status == AWAKE)
{
- int loc_x = info.getInteger("loc_x");
- int loc_y = info.getInteger("loc_y");
- int loc_z = info.getInteger("loc_z");
- int heading = info.getInteger("heading");
- final int hp = info.getInteger("currentHP");
- final int mp = info.getInteger("currentMP");
+ int loc_x = info.getInt("loc_x");
+ int loc_y = info.getInt("loc_y");
+ int loc_z = info.getInt("loc_z");
+ int heading = info.getInt("heading");
+ final int hp = info.getInt("currentHP");
+ final int mp = info.getInt("currentMP");
L2GrandBossInstance baium = (L2GrandBossInstance) addSpawn(LIVE_BAIUM, loc_x, loc_y, loc_z, heading, false, 0);
GrandBossManager.getInstance().addBoss(baium);
final L2Npc _baium = baium;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java
index e4adbabc70..605aea24fd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Core.java
@@ -91,12 +91,12 @@ public class Core extends AbstractNpcAI
{
_FirstAttacked = true;
}
- int loc_x = info.getInteger("loc_x");
- int loc_y = info.getInteger("loc_y");
- int loc_z = info.getInteger("loc_z");
- int heading = info.getInteger("heading");
- int hp = info.getInteger("currentHP");
- int mp = info.getInteger("currentMP");
+ int loc_x = info.getInt("loc_x");
+ int loc_y = info.getInt("loc_y");
+ int loc_z = info.getInt("loc_z");
+ int heading = info.getInt("heading");
+ int hp = info.getInt("currentHP");
+ int mp = info.getInt("currentMP");
L2GrandBossInstance core = (L2GrandBossInstance) addSpawn(CORE, loc_x, loc_y, loc_z, heading, false, 0);
core.setCurrentHpMp(hp, mp);
spawnBoss(core);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
index 17b4f844c0..0bf8086923 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java
@@ -126,12 +126,12 @@ public class Orfen extends AbstractNpcAI
}
else
{
- int loc_x = info.getInteger("loc_x");
- int loc_y = info.getInteger("loc_y");
- int loc_z = info.getInteger("loc_z");
- int heading = info.getInteger("heading");
- int hp = info.getInteger("currentHP");
- int mp = info.getInteger("currentMP");
+ int loc_x = info.getInt("loc_x");
+ int loc_y = info.getInt("loc_y");
+ int loc_z = info.getInt("loc_z");
+ int heading = info.getInt("heading");
+ int hp = info.getInt("currentHP");
+ int mp = info.getInt("currentMP");
L2GrandBossInstance orfen = (L2GrandBossInstance) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0);
orfen.setCurrentHpMp(hp, mp);
spawnBoss(orfen);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
index 2eb42e3417..34d0167c66 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
@@ -114,12 +114,12 @@ public class QueenAnt extends AbstractNpcAI
}
else
{
- int loc_x = info.getInteger("loc_x");
- int loc_y = info.getInteger("loc_y");
- int loc_z = info.getInteger("loc_z");
- int heading = info.getInteger("heading");
- int hp = info.getInteger("currentHP");
- int mp = info.getInteger("currentMP");
+ int loc_x = info.getInt("loc_x");
+ int loc_y = info.getInt("loc_y");
+ int loc_z = info.getInt("loc_z");
+ int heading = info.getInt("heading");
+ int hp = info.getInt("currentHP");
+ int mp = info.getInt("currentMP");
if (!_zone.isInsideZone(loc_x, loc_y, loc_z))
{
loc_x = QUEEN_X;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
index b285bb0f10..891de2ba45 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Valakas.java
@@ -151,12 +151,12 @@ public class Valakas extends AbstractNpcAI
}
else
{
- final int loc_x = info.getInteger("loc_x");
- final int loc_y = info.getInteger("loc_y");
- final int loc_z = info.getInteger("loc_z");
- final int heading = info.getInteger("heading");
- final int hp = info.getInteger("currentHP");
- final int mp = info.getInteger("currentMP");
+ final int loc_x = info.getInt("loc_x");
+ final int loc_y = info.getInt("loc_y");
+ final int loc_z = info.getInt("loc_z");
+ final int heading = info.getInt("heading");
+ final int hp = info.getInt("currentHP");
+ final int mp = info.getInt("currentMP");
final L2Npc valakas = addSpawn(VALAKAS, loc_x, loc_y, loc_z, heading, false, 0);
GrandBossManager.getInstance().addBoss((L2GrandBossInstance) valakas);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
index 8976e0abea..5d49e5d52d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
@@ -388,7 +388,7 @@ public final class Venom extends AbstractNpcAI
int checkStatus = ALIVE;
if (GlobalVariablesManager.getInstance().hasVariable("VenomStatus"))
{
- checkStatus = GlobalVariablesManager.getInstance().getInteger("VenomStatus");
+ checkStatus = GlobalVariablesManager.getInstance().getInt("VenomStatus");
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java
index c7f535b51b..eb125469f2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java
@@ -199,12 +199,12 @@ public class Zaken extends AbstractNpcAI
}
else
{
- int loc_x = info.getInteger("loc_x");
- int loc_y = info.getInteger("loc_y");
- int loc_z = info.getInteger("loc_z");
- int heading = info.getInteger("heading");
- int hp = info.getInteger("currentHP");
- int mp = info.getInteger("currentMP");
+ int loc_x = info.getInt("loc_x");
+ int loc_y = info.getInt("loc_y");
+ int loc_z = info.getInt("loc_z");
+ int heading = info.getInt("heading");
+ int hp = info.getInt("currentHP");
+ int mp = info.getInt("currentMP");
L2GrandBossInstance zaken = (L2GrandBossInstance) addSpawn(ZAKEN, loc_x, loc_y, loc_z, heading, false, 0);
zaken.setCurrentHpMp(hp, mp);
spawnBoss(zaken);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
index 89b11566d5..8b1f827c2f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
@@ -216,14 +216,14 @@ public class Festival implements IBypassHandler
final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType());
final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType());
- final int dawnScore = dawnData.getInteger("score");
- final int duskScore = duskData.getInteger("score");
+ final int dawnScore = dawnData.getInt("score");
+ final int duskScore = duskData.getInt("score");
int overallScore = 0;
// If no data is returned, assume there is no record, or all scores are 0.
if (overallData != null)
{
- overallScore = overallData.getInteger("score");
+ overallScore = overallData.getInt("score");
}
StringUtil.append(strBuffer, SevenSignsFestival.getFestivalName(npc.getFestivalType()), " festival.<br>");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
index 1387ca47c8..22a0729964 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Bluff.java
@@ -39,7 +39,7 @@ public class Bluff extends L2Effect
public Bluff(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index ac200f732a..ed853532e4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -46,8 +46,8 @@ public class CallPc extends L2Effect
public CallPc(Env env, EffectTemplate template)
{
super(env, template);
- _itemId = template.getParameters().getInteger("itemId", 0);
- _itemCount = template.getParameters().getInteger("itemCount", 0);
+ _itemId = template.getParameters().getInt("itemId", 0);
+ _itemCount = template.getParameters().getInt("itemCount", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
index f6c8e84861..21553b8b9c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
@@ -44,7 +44,7 @@ public class Confuse extends L2Effect
public Confuse(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
index 22948659bf..ce016a6a8e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
@@ -34,7 +34,7 @@ public class DamOverTime extends L2Effect
public DamOverTime(Env env, EffectTemplate template)
{
super(env, template);
- _canKill = template.hasParameters() && template.getParameters().getBool("canKill", false);
+ _canKill = template.hasParameters() && template.getParameters().getBoolean("canKill", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 36b45b911e..a44ad06f3e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -35,7 +35,7 @@ public class DamOverTimePercent extends L2Effect
public DamOverTimePercent(Env env, EffectTemplate template)
{
super(env, template);
- _canKill = template.hasParameters() && template.getParameters().getBool("canKill", false);
+ _canKill = template.hasParameters() && template.getParameters().getBoolean("canKill", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
index af95dff99e..c4a0dfdb95 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
@@ -37,7 +37,7 @@ public class DeleteHate extends L2Effect
public DeleteHate(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
index 1de0470fe5..d26c442d27 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
@@ -37,7 +37,7 @@ public class DeleteHateOfMe extends L2Effect
public DeleteHateOfMe(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java
index e734cf6353..ac1afe7f9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java
@@ -40,8 +40,8 @@ public class DispelByCategory extends L2Effect
{
super(env, template);
_slot = template.getParameters().getString("slot", null);
- _rate = template.getParameters().getInteger("rate", 0);
- _max = template.getParameters().getInteger("max", 0);
+ _rate = template.getParameters().getInt("rate", 0);
+ _max = template.getParameters().getInt("max", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
index 8467e6441e..826e65d87a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
@@ -44,7 +44,7 @@ public class DispelBySlotProbability extends L2Effect
{
super(env, template);
_dispel = template.getParameters().getString("dispel", null);
- _rate = template.getParameters().getInteger("rate", 0);
+ _rate = template.getParameters().getInt("rate", 0);
if ((_dispel != null) && !_dispel.isEmpty())
{
_dispelAbnormals = new EnumMap<>(AbnormalType.class);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
index b9a5485f12..9dde698e90 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
@@ -39,8 +39,8 @@ public class Lethal extends L2Effect
public Lethal(Env env, EffectTemplate template)
{
super(env, template);
- _fullLethal = template.getParameters().getInteger("fullLethal", 0);
- _halfLethal = template.getParameters().getInteger("halfLethal", 0);
+ _fullLethal = template.getParameters().getInt("fullLethal", 0);
+ _halfLethal = template.getParameters().getInt("halfLethal", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
index 2410b8961b..6f37f47c87 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
@@ -40,7 +40,7 @@ public class RandomizeHate extends L2Effect
public RandomizeHate(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
index 2d76925aa7..5a6b7b08e8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Restoration.java
@@ -37,8 +37,8 @@ public class Restoration extends L2Effect
public Restoration(Env env, EffectTemplate template)
{
super(env, template);
- _itemId = template.getParameters().getInteger("itemId", 0);
- _itemCount = template.getParameters().getInteger("itemCount", 0);
+ _itemId = template.getParameters().getInt("itemId", 0);
+ _itemCount = template.getParameters().getInt("itemCount", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
index 83b91dbaba..858818f45d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java
@@ -37,8 +37,8 @@ public class SetSkill extends L2Effect
public SetSkill(Env env, EffectTemplate template)
{
super(env, template);
- _skillId = template.getParameters().getInteger("skillId", 0);
- _skillLvl = template.getParameters().getInteger("skillLvl", 1);
+ _skillId = template.getParameters().getInt("skillId", 0);
+ _skillLvl = template.getParameters().getInt("skillLvl", 1);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
index 650b44df1b..81f2c3fb4d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
@@ -34,7 +34,7 @@ public class SkillTurning extends L2Effect
public SkillTurning(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
index f46b8a5e13..9b8fb6fa31 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java
@@ -41,13 +41,13 @@ public final class SoulEating extends L2Effect implements IExperienceReceivedEve
public SoulEating(Env env, EffectTemplate template)
{
super(env, template);
- _expNeeded = template.getParameters().getInteger("expNeeded");
+ _expNeeded = template.getParameters().getInt("expNeeded");
}
public SoulEating(Env env, L2Effect effect)
{
super(env, effect);
- _expNeeded = effect.getEffectTemplate().getParameters().getInteger("expNeeded");
+ _expNeeded = effect.getEffectTemplate().getParameters().getInt("expNeeded");
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
index b031138bc5..c713ba78dc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
@@ -42,8 +42,8 @@ public class StealAbnormal extends L2Effect
{
super(env, template);
_slot = template.getParameters().getString("slot", null);
- _rate = template.getParameters().getInteger("rate", 0);
- _max = template.getParameters().getInteger("max", 0);
+ _rate = template.getParameters().getInt("rate", 0);
+ _max = template.getParameters().getInt("max", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index a659ff0499..74f404645e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -48,13 +48,13 @@ public class SummonCubic extends L2Effect
public SummonCubic(Env env, EffectTemplate template)
{
super(env, template);
- _cubicId = template.getParameters().getInteger("cubicId", -1);
+ _cubicId = template.getParameters().getInt("cubicId", -1);
// Custom AI data.
- _cubicPower = template.getParameters().getInteger("cubicPower", 0);
- _cubicDuration = template.getParameters().getInteger("cubicDuration", 0);
- _cubicDelay = template.getParameters().getInteger("cubicDelay", 0);
- _cubicMaxCount = template.getParameters().getInteger("cubicMaxCount", -1);
- _cubicSkillChance = template.getParameters().getInteger("cubicSkillChance", 0);
+ _cubicPower = template.getParameters().getInt("cubicPower", 0);
+ _cubicDuration = template.getParameters().getInt("cubicDuration", 0);
+ _cubicDelay = template.getParameters().getInt("cubicDelay", 0);
+ _cubicMaxCount = template.getParameters().getInt("cubicMaxCount", -1);
+ _cubicSkillChance = template.getParameters().getInt("cubicSkillChance", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
index 3f303ee796..bdeddfc95f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java
@@ -49,11 +49,11 @@ public class SummonNpc extends L2Effect
public SummonNpc(Env env, EffectTemplate template)
{
super(env, template);
- _despawnDelay = template.getParameters().getInteger("despawnDelay", 20000);
- _npcId = template.getParameters().getInteger("npcId", 0);
- _npcCount = template.getParameters().getInteger("npcCount", 1);
- _randomOffset = template.getParameters().getBool("randomOffset", false);
- _isSummonSpawn = template.getParameters().getBool("isSummonSpawn", false);
+ _despawnDelay = template.getParameters().getInt("despawnDelay", 20000);
+ _npcId = template.getParameters().getInt("npcId", 0);
+ _npcCount = template.getParameters().getInt("npcCount", 1);
+ _randomOffset = template.getParameters().getBoolean("randomOffset", false);
+ _isSummonSpawn = template.getParameters().getBoolean("isSummonSpawn", false);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
index 7ab8b57352..258b87c0d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java
@@ -40,8 +40,8 @@ public class SummonTrap extends L2Effect
public SummonTrap(Env env, EffectTemplate template)
{
super(env, template);
- _despawnTime = template.getParameters().getInteger("despawnTime", 0);
- _npcId = template.getParameters().getInteger("npcId", 0);
+ _despawnTime = template.getParameters().getInt("despawnTime", 0);
+ _npcId = template.getParameters().getInt("npcId", 0);
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
index 03a3206941..8771014c26 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
@@ -36,7 +36,7 @@ public class TargetCancel extends L2Effect
public TargetCancel(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
index bbaa674f89..3ffb3503be 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
@@ -37,7 +37,7 @@ public class TargetMeProbability extends L2Effect
public TargetMeProbability(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
index b45a7abd33..ec6922f94f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Teleport.java
@@ -35,7 +35,7 @@ public class Teleport extends L2Effect
public Teleport(Env env, EffectTemplate template)
{
super(env, template);
- _loc = new Location(template.getParameters().getInteger("x", 0), template.getParameters().getInteger("y", 0), template.getParameters().getInteger("z", 0));
+ _loc = new Location(template.getParameters().getInt("x", 0), template.getParameters().getInt("y", 0), template.getParameters().getInt("z", 0));
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
index e1e580b8cb..73f83edc70 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
@@ -38,7 +38,7 @@ public class TransferHate extends L2Effect
public TransferHate(Env env, EffectTemplate template)
{
super(env, template);
- _chance = template.hasParameters() ? template.getParameters().getInteger("chance", 100) : 100;
+ _chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index e93c88105e..e1fbbe34b7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -43,21 +43,21 @@ public class TriggerSkillByDamage extends L2Effect implements IDamageReceivedEve
public TriggerSkillByDamage(Env env, EffectTemplate template)
{
super(env, template);
- _minLevel = template.getParameters().getInteger("minLevel", 1);
- _maxLevel = template.getParameters().getInteger("maxLevel", 100);
- _minDamage = template.getParameters().getInteger("minDamage", 1);
- _chance = template.getParameters().getInteger("chance", 100);
- _skill = new SkillHolder(template.getParameters().getInteger("skillId"), template.getParameters().getInteger("skillLevel", 1));
+ _minLevel = template.getParameters().getInt("minLevel", 1);
+ _maxLevel = template.getParameters().getInt("maxLevel", 100);
+ _minDamage = template.getParameters().getInt("minDamage", 1);
+ _chance = template.getParameters().getInt("chance", 100);
+ _skill = new SkillHolder(template.getParameters().getInt("skillId"), template.getParameters().getInt("skillLevel", 1));
}
public TriggerSkillByDamage(Env env, L2Effect effect)
{
super(env, effect);
- _minLevel = effect.getEffectTemplate().getParameters().getInteger("minLevel", 1);
- _maxLevel = effect.getEffectTemplate().getParameters().getInteger("maxLevel", 100);
- _minDamage = effect.getEffectTemplate().getParameters().getInteger("minDamage", 1);
- _chance = effect.getEffectTemplate().getParameters().getInteger("chance", 100);
- _skill = new SkillHolder(effect.getEffectTemplate().getParameters().getInteger("skillId"), effect.getEffectTemplate().getParameters().getInteger("skillLevel", 1));
+ _minLevel = effect.getEffectTemplate().getParameters().getInt("minLevel", 1);
+ _maxLevel = effect.getEffectTemplate().getParameters().getInt("maxLevel", 100);
+ _minDamage = effect.getEffectTemplate().getParameters().getInt("minDamage", 1);
+ _chance = effect.getEffectTemplate().getParameters().getInt("chance", 100);
+ _skill = new SkillHolder(effect.getEffectTemplate().getParameters().getInt("skillId"), effect.getEffectTemplate().getParameters().getInt("skillLevel", 1));
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index 9c599afff2..97044c8e9c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -139,9 +139,9 @@ public final class Q00261_CollectorsDream extends Quest
vars.set("GUIDE_MISSION", 100000);
player.sendPacket(MESSAGE);
}
- else if (((vars.getInteger("GUIDE_MISSION") % 100000000) / 10000000) != 1)
+ else if (((vars.getInt("GUIDE_MISSION") % 100000000) / 10000000) != 1)
{
- vars.set("GUIDE_MISSION", vars.getInteger("GUIDE_MISSION") + 10000000);
+ vars.set("GUIDE_MISSION", vars.getInt("GUIDE_MISSION") + 10000000);
player.sendPacket(MESSAGE);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
index 4f9d60157a..44eb61096c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
@@ -199,7 +199,7 @@ public final class Q00281_HeadForTheHills extends Quest
public static final void giveNewbieReward(L2PcInstance player)
{
final PlayerVariables vars = player.getVariables();
- if ((player.getLevel() < 25) && !vars.getBool("NEWBIE_SHOTS", false))
+ if ((player.getLevel() < 25) && !vars.getBoolean("NEWBIE_SHOTS", false))
{
if (player.isMageClass())
{
@@ -218,9 +218,9 @@ public final class Q00281_HeadForTheHills extends Quest
vars.set("GUIDE_MISSION", 1000);
player.sendPacket(MESSAGE);
}
- else if (((vars.getInteger("GUIDE_MISSION") % 10000) / 1000) != 1)
+ else if (((vars.getInt("GUIDE_MISSION") % 10000) / 1000) != 1)
{
- vars.set("GUIDE_MISSION", vars.getInteger("GUIDE_MISSION") + 1000);
+ vars.set("GUIDE_MISSION", vars.getInt("GUIDE_MISSION") + 1000);
player.sendPacket(MESSAGE);
}
}
--
GitLab