Changeset 1508

User picture

Author: MrPoke

(2010/03/13 11:48) Almost 2 years ago

QuestState save to database fix.

Affected files

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/admincommands/QuestCommand.java Download diff

15071508
119
				return;
119
				return;
120
			}
120
			}
121
			qs.setStatus(questStatus);
121
			qs.setStatus(questStatus);
122
			qs.getQuestVars().setQuestVar(var);
122
			qs.setQuestVar(var);
123
			PacketSendUtility.sendPacket(target, new SM_QUEST_STEP(questId, qs.getStatus(), qs.getQuestVars().getQuestVars()));
123
			PacketSendUtility.sendPacket(target, new SM_QUEST_STEP(questId, qs.getStatus(), qs.getQuestVars().getQuestVars()));
124
		}
124
		}
125
		else 
125
		else 

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_1006Ascension.java Download diff

15071508
98
		if(qs == null || qs.getStatus() != QuestStatus.START)
98
		if(qs == null || qs.getStatus() != QuestStatus.START)
99
			return false;
99
			return false;
100
100
101
		int var = qs.getQuestVars().getQuestVarById(0);
101
		int var = qs.getQuestVarById(0);
102
		int targetId = 0;
102
		int targetId = 0;
103
		if(env.getVisibleObject() instanceof Npc)
103
		if(env.getVisibleObject() instanceof Npc)
104
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
104
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
107
		{
107
		{
108
			if(var >= 51 && var <= 53)
108
			if(var >= 51 && var <= 53)
109
			{
109
			{
110
				qs.getQuestVars().setQuestVar(qs.getQuestVars().getQuestVars() + 1);
110
				qs.setQuestVar(qs.getQuestVars().getQuestVars() + 1);
111
				updateQuestStatus(player, qs);
111
				updateQuestStatus(player, qs);
112
				return true;
112
				return true;
113
			}
113
			}
114
			else if(var == 54)
114
			else if(var == 54)
115
			{
115
			{
116
				qs.getQuestVars().setQuestVar(4);
116
				qs.setQuestVar(4);
117
				updateQuestStatus(player, qs);
117
				updateQuestStatus(player, qs);
118
				Npc mob = (Npc) questService.addNewSpawn(310010000, instanceId, 211043, (float) 226.7, (float) 251.5, (float) 205.5, (byte) 0, true);
118
				Npc mob = (Npc) questService.addNewSpawn(310010000, instanceId, 211043, (float) 226.7, (float) 251.5, (float) 205.5, (byte) 0, true);
119
				// TODO: Tempt decrease P attack.
119
				// TODO: Tempt decrease P attack.
...
...
159
							if(player.getInventory().getItemCountByItemId(182200007) == 0)
159
							if(player.getInventory().getItemCountByItemId(182200007) == 0)
160
								if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182200007, 1))))
160
								if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182200007, 1))))
161
									return true;
161
									return true;
162
							qs.getQuestVars().setQuestVarById(0, var + 1);
162
							qs.setQuestVarById(0, var + 1);
163
							updateQuestStatus(player, qs);
163
							updateQuestStatus(player, qs);
164
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
164
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
165
							return true;
165
							return true;
...
...
168
						if(var == 3)
168
						if(var == 3)
169
						{
169
						{
170
							player.getInventory().removeFromBagByItemId(182200009, 1);
170
							player.getInventory().removeFromBagByItemId(182200009, 1);
171
							qs.getQuestVars().setQuestVar(99);
171
							qs.setQuestVar(99);
172
							updateQuestStatus(player, qs);
172
							updateQuestStatus(player, qs);
173
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
173
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
174
							WorldMapInstance newInstance = player.getPosition().getWorld().getNextAvailableInstance(310010000);
174
							WorldMapInstance newInstance = player.getPosition().getWorld().getNextAvailableInstance(310010000);
...
...
238
					case 10001:
238
					case 10001:
239
						if(var == 2)
239
						if(var == 2)
240
						{
240
						{
241
							qs.getQuestVars().setQuestVarById(0, var + 1);
241
							qs.setQuestVarById(0, var + 1);
242
							updateQuestStatus(player, qs);
242
							updateQuestStatus(player, qs);
243
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
243
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
244
							return true;
244
							return true;
...
...
253
						if(var == 99)
253
						if(var == 99)
254
						{
254
						{
255
							PacketSendUtility.sendPacket(player, new SM_EMOTION(player, 6, 1001, 0));
255
							PacketSendUtility.sendPacket(player, new SM_EMOTION(player, 6, 1001, 0));
256
							qs.getQuestVars().setQuestVar(50);
256
							qs.setQuestVar(50);
257
							updateQuestStatus(player, qs);
257
							updateQuestStatus(player, qs);
258
							ThreadPoolManager.getInstance().schedule(new Runnable(){
258
							ThreadPoolManager.getInstance().schedule(new Runnable(){
259
								@Override
259
								@Override
260
								public void run()
260
								public void run()
261
								{
261
								{
262
									qs.getQuestVars().setQuestVar(51);
262
									qs.setQuestVar(51);
263
									updateQuestStatus(player, qs);
263
									updateQuestStatus(player, qs);
264
									List<Npc> mobs = new ArrayList<Npc>();
264
									List<Npc> mobs = new ArrayList<Npc>();
265
									mobs.add((Npc) questService.addNewSpawn(310010000, instanceId, 211042, (float) 224.073, (float) 239.1, (float) 206.7, (byte) 0, true));
265
									mobs.add((Npc) questService.addNewSpawn(310010000, instanceId, 211042, (float) 224.073, (float) 239.1, (float) 206.7, (byte) 0, true));
...
...
350
				PacketSendUtility.broadcastPacket(player, new SM_ITEM_USAGE_ANIMATION(player.getObjectId(), itemObjId, id, 0, 1, 0), true);
350
				PacketSendUtility.broadcastPacket(player, new SM_ITEM_USAGE_ANIMATION(player.getObjectId(), itemObjId, id, 0, 1, 0), true);
351
				player.getInventory().removeFromBagByObjectId(itemObjId, 1);
351
				player.getInventory().removeFromBagByObjectId(itemObjId, 1);
352
				itemService.addItems(player, Collections.singletonList(new QuestItems(182200008, 1)));
352
				itemService.addItems(player, Collections.singletonList(new QuestItems(182200008, 1)));
353
				qs.getQuestVars().setQuestVarById(0, 2);
353
				qs.setQuestVarById(0, 2);
354
				updateQuestStatus(player, qs);
354
				updateQuestStatus(player, qs);
355
			}
355
			}
356
		}, 3000);
356
		}, 3000);
...
...
368
		if(qs == null || qs.getStatus() != QuestStatus.START || qs.getQuestVars().getQuestVars() != 4)
368
		if(qs == null || qs.getStatus() != QuestStatus.START || qs.getQuestVars().getQuestVars() != 4)
369
			return false;
369
			return false;
370
		questService.addNewSpawn(310010000, instanceId, 790001, (float) 220.6, (float) 247.8, (float) 206.0, (byte) 0, true);
370
		questService.addNewSpawn(310010000, instanceId, 790001, (float) 220.6, (float) 247.8, (float) 206.0, (byte) 0, true);
371
		qs.getQuestVars().setQuestVar(5);
371
		qs.setQuestVar(5);
372
		updateQuestStatus(player, qs);
372
		updateQuestStatus(player, qs);
373
		return true;
373
		return true;
374
	}
374
	}
...
...
394
		int var = qs.getQuestVars().getQuestVars();
394
		int var = qs.getQuestVars().getQuestVars();
395
		if(var == 4 || (var >= 50 && var <= 55))
395
		if(var == 4 || (var >= 50 && var <= 55))
396
		{
396
		{
397
			qs.getQuestVars().setQuestVar(3);
397
			qs.setQuestVar(3);
398
			updateQuestStatus(player, qs);
398
			updateQuestStatus(player, qs);
399
			PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
399
			PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
400
		}
400
		}
...
...
418
					id = worldMap.getWorldMapScriptInstanceIdByPlyerObjId(player.getObjectId());
418
					id = worldMap.getWorldMapScriptInstanceIdByPlyerObjId(player.getObjectId());
419
				if(id == -1 || player.getWorldId() != 310010000)
419
				if(id == -1 || player.getWorldId() != 310010000)
420
				{
420
				{
421
					qs.getQuestVars().setQuestVar(3);
421
					qs.setQuestVar(3);
422
					updateQuestStatus(player, qs);
422
					updateQuestStatus(player, qs);
423
					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
423
					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
424
					teleportService.teleportTo(player, 210010000, 1, 244f, 1639f, 100.5f, 1000);
424
					teleportService.teleportTo(player, 210010000, 1, 244f, 1639f, 100.5f, 1000);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_1007ACeremonyinSanctum.java Download diff

15071508
86
					case 10000:
86
					case 10000:
87
						if (var == 0)
87
						if (var == 0)
88
						{
88
						{
89
							qs.getQuestVars().setQuestVar(1);
89
							qs.setQuestVar(1);
90
							updateQuestStatus(player, qs);
90
							updateQuestStatus(player, qs);
91
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),0));
91
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),0));
92
							
92
							
...
...
111
					case 10001:
111
					case 10001:
112
						if(var == 1)
112
						if(var == 1)
113
						{
113
						{
114
							qs.getQuestVars().setQuestVarById(0, var + 1);
114
							qs.setQuestVarById(0, var + 1);
115
							updateQuestStatus(player, qs);
115
							updateQuestStatus(player, qs);
116
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
116
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
117
								.getObjectId(), 10));
117
								.getObjectId(), 10));
...
...
137
						{
137
						{
138
							PlayerClass playerClass = PlayerClass.getStartingClassFor(player.getCommonData().getPlayerClass());
138
							PlayerClass playerClass = PlayerClass.getStartingClassFor(player.getCommonData().getPlayerClass());
139
							if (playerClass == PlayerClass.WARRIOR)
139
							if (playerClass == PlayerClass.WARRIOR)
140
								qs.getQuestVars().setQuestVar(10);
140
								qs.setQuestVar(10);
141
							else if (playerClass == PlayerClass.SCOUT)
141
							else if (playerClass == PlayerClass.SCOUT)
142
								qs.getQuestVars().setQuestVar(20);
142
								qs.setQuestVar(20);
143
							else if (playerClass == PlayerClass.MAGE)
143
							else if (playerClass == PlayerClass.MAGE)
144
								qs.getQuestVars().setQuestVar(30);
144
								qs.setQuestVar(30);
145
							else if (playerClass == PlayerClass.PRIEST)
145
							else if (playerClass == PlayerClass.PRIEST)
146
								qs.getQuestVars().setQuestVar(40);
146
								qs.setQuestVar(40);
147
							qs.setStatus(QuestStatus.REWARD);
147
							qs.setStatus(QuestStatus.REWARD);
148
							updateQuestStatus(player, qs);
148
							updateQuestStatus(player, qs);
149
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
149
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_2008Ascension.java Download diff

15071508
92
		if(qs == null || qs.getStatus() != QuestStatus.START)
92
		if(qs == null || qs.getStatus() != QuestStatus.START)
93
			return false;
93
			return false;
94
94
95
		int var = qs.getQuestVars().getQuestVarById(0);
95
		int var = qs.getQuestVarById(0);
96
		int targetId = 0;
96
		int targetId = 0;
97
		if(env.getVisibleObject() instanceof Npc)
97
		if(env.getVisibleObject() instanceof Npc)
98
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
98
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
101
		{
101
		{
102
			if(var >= 51 && var <= 53)
102
			if(var >= 51 && var <= 53)
103
			{
103
			{
104
				qs.getQuestVars().setQuestVar(qs.getQuestVars().getQuestVars() + 1);
104
				qs.setQuestVar(qs.getQuestVars().getQuestVars() + 1);
105
				updateQuestStatus(player, qs);
105
				updateQuestStatus(player, qs);
106
				return true;
106
				return true;
107
			}
107
			}
108
			else if(var == 54)
108
			else if(var == 54)
109
			{
109
			{
110
				qs.getQuestVars().setQuestVar(5);
110
				qs.setQuestVar(5);
111
				updateQuestStatus(player, qs);
111
				updateQuestStatus(player, qs);
112
				Npc mob = (Npc) questService.addNewSpawn(320010000, instanceId, 205041, 301f, 259f, 205.5f, (byte) 0, true);
112
				Npc mob = (Npc) questService.addNewSpawn(320010000, instanceId, 205041, 301f, 259f, 205.5f, (byte) 0, true);
113
				// TODO: Tempt decrease P attack.
113
				// TODO: Tempt decrease P attack.
...
...
180
					case 10000:
180
					case 10000:
181
						if(var == 0)
181
						if(var == 0)
182
						{
182
						{
183
							qs.getQuestVars().setQuestVarById(0, var + 1);
183
							qs.setQuestVarById(0, var + 1);
184
							updateQuestStatus(player, qs);
184
							updateQuestStatus(player, qs);
185
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
185
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
186
							return true;
186
							return true;
...
...
188
					case 10004:
188
					case 10004:
189
						if(var == 4)
189
						if(var == 4)
190
						{
190
						{
191
							qs.getQuestVars().setQuestVar(99);
191
							qs.setQuestVar(99);
192
							updateQuestStatus(player, qs);
192
							updateQuestStatus(player, qs);
193
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
193
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
194
							// Create instance
194
							// Create instance
...
...
250
								if (itemService.addItems(player, Collections.singletonList(new QuestItems(182203009, 1))))
250
								if (itemService.addItems(player, Collections.singletonList(new QuestItems(182203009, 1))))
251
									return true;
251
									return true;
252
								
252
								
253
							qs.getQuestVars().setQuestVarById(0, var + 1);
253
							qs.setQuestVarById(0, var + 1);
254
							updateQuestStatus(player, qs);
254
							updateQuestStatus(player, qs);
255
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
255
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
256
							return true;
256
							return true;
...
...
270
							if(player.getInventory().getItemCountByItemId(182203010) == 0)
270
							if(player.getInventory().getItemCountByItemId(182203010) == 0)
271
								if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182203010, 1))))
271
								if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182203010, 1))))
272
									return true;
272
									return true;
273
							qs.getQuestVars().setQuestVarById(0, var + 1);
273
							qs.setQuestVarById(0, var + 1);
274
							updateQuestStatus(player, qs);
274
							updateQuestStatus(player, qs);
275
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
275
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
276
							return true;
276
							return true;
...
...
291
								if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182203011, 1))))
291
								if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182203011, 1))))
292
									return true;
292
									return true;
293
								
293
								
294
							qs.getQuestVars().setQuestVarById(0, var + 1);
294
							qs.setQuestVarById(0, var + 1);
295
							updateQuestStatus(player, qs);
295
							updateQuestStatus(player, qs);
296
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
296
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
297
							return true;
297
							return true;
...
...
306
						if(var == 99)
306
						if(var == 99)
307
						{
307
						{
308
							PacketSendUtility.sendPacket(player, new SM_EMOTION(player, 6, 3001, 0));
308
							PacketSendUtility.sendPacket(player, new SM_EMOTION(player, 6, 3001, 0));
309
							qs.getQuestVars().setQuestVar(50);
309
							qs.setQuestVar(50);
310
							updateQuestStatus(player, qs);
310
							updateQuestStatus(player, qs);
311
							ThreadPoolManager.getInstance().schedule(new Runnable(){
311
							ThreadPoolManager.getInstance().schedule(new Runnable(){
312
								@Override
312
								@Override
313
								public void run()
313
								public void run()
314
								{
314
								{
315
									qs.getQuestVars().setQuestVar(51);
315
									qs.setQuestVar(51);
316
									updateQuestStatus(player, qs);
316
									updateQuestStatus(player, qs);
317
									List<Npc> mobs = new ArrayList<Npc>();
317
									List<Npc> mobs = new ArrayList<Npc>();
318
									mobs.add((Npc) questService.addNewSpawn(320010000, instanceId, 205040, 294f, 277f, 207f, (byte) 0, true));
318
									mobs.add((Npc) questService.addNewSpawn(320010000, instanceId, 205040, 294f, 277f, 207f, (byte) 0, true));
...
...
378
					id = worldMap.getWorldMapScriptInstanceIdByPlyerObjId(player.getObjectId());
378
					id = worldMap.getWorldMapScriptInstanceIdByPlyerObjId(player.getObjectId());
379
				if(id == -1 || player.getWorldId() != 320010000)
379
				if(id == -1 || player.getWorldId() != 320010000)
380
				{
380
				{
381
					qs.getQuestVars().setQuestVar(4);
381
					qs.setQuestVar(4);
382
					updateQuestStatus(player, qs);
382
					updateQuestStatus(player, qs);
383
					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
383
					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
384
					teleportService.teleportTo(player, 220010000, 1, 378.9f, 1895.39f, 330.0f, 1000);
384
					teleportService.teleportTo(player, 220010000, 1, 378.9f, 1895.39f, 330.0f, 1000);
...
...
401
			return false;
401
			return false;
402
		int instanceId = player.getInstanceId();
402
		int instanceId = player.getInstanceId();
403
		questService.addNewSpawn(320010000, instanceId, 203550, 301.92999f, 274.26001f, 205.7f, (byte) 0, true);
403
		questService.addNewSpawn(320010000, instanceId, 203550, 301.92999f, 274.26001f, 205.7f, (byte) 0, true);
404
		qs.getQuestVars().setQuestVar(6);
404
		qs.setQuestVar(6);
405
		updateQuestStatus(player, qs);
405
		updateQuestStatus(player, qs);
406
		return true;
406
		return true;
407
	}
407
	}
...
...
428
		int var = qs.getQuestVars().getQuestVars();
428
		int var = qs.getQuestVars().getQuestVars();
429
		if(var == 5 || (var >= 51 && var <= 53))
429
		if(var == 5 || (var >= 51 && var <= 53))
430
		{
430
		{
431
			qs.getQuestVars().setQuestVar(4);
431
			qs.setQuestVar(4);
432
			updateQuestStatus(player, qs);
432
			updateQuestStatus(player, qs);
433
			PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1,
DataManager.QUEST_DATA.getQuestById(env.getQuestId()).getName()));
433
			PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1,
DataManager.QUEST_DATA.getQuestById(env.getQuestId()).getName()));
434
		}
434
		}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_2009ACeremonyinPandaemonium.java Download diff

15071508
86
					case 10000:
86
					case 10000:
87
						if (var == 0)
87
						if (var == 0)
88
						{
88
						{
89
							qs.getQuestVars().setQuestVar(1);
89
							qs.setQuestVar(1);
90
							updateQuestStatus(player, qs);
90
							updateQuestStatus(player, qs);
91
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),0));
91
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),0));
92
							
92
							
...
...
111
					case 10001:
111
					case 10001:
112
						if(var == 1)
112
						if(var == 1)
113
						{
113
						{
114
							qs.getQuestVars().setQuestVarById(0, var + 1);
114
							qs.setQuestVarById(0, var + 1);
115
							updateQuestStatus(player, qs);
115
							updateQuestStatus(player, qs);
116
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
116
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
117
								.getObjectId(), 10));
117
								.getObjectId(), 10));
...
...
137
						{
137
						{
138
							PlayerClass playerClass = PlayerClass.getStartingClassFor(player.getCommonData().getPlayerClass());
138
							PlayerClass playerClass = PlayerClass.getStartingClassFor(player.getCommonData().getPlayerClass());
139
							if (playerClass == PlayerClass.WARRIOR)
139
							if (playerClass == PlayerClass.WARRIOR)
140
								qs.getQuestVars().setQuestVar(10);
140
								qs.setQuestVar(10);
141
							else if (playerClass == PlayerClass.SCOUT)
141
							else if (playerClass == PlayerClass.SCOUT)
142
								qs.getQuestVars().setQuestVar(20);
142
								qs.setQuestVar(20);
143
							else if (playerClass == PlayerClass.MAGE)
143
							else if (playerClass == PlayerClass.MAGE)
144
								qs.getQuestVars().setQuestVar(30);
144
								qs.setQuestVar(30);
145
							else if (playerClass == PlayerClass.PRIEST)
145
							else if (playerClass == PlayerClass.PRIEST)
146
								qs.getQuestVars().setQuestVar(40);
146
								qs.setQuestVar(40);
147
							qs.setStatus(QuestStatus.REWARD);
147
							qs.setStatus(QuestStatus.REWARD);
148
							updateQuestStatus(player, qs);
148
							updateQuestStatus(player, qs);
149
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
149
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/eltnen/_1300OrdersfromTelemachus.java Download diff

15071508
74
		{
74
		{
75
			if(env.getDialogId() == 25)
75
			if(env.getDialogId() == 25)
76
			{
76
			{
77
				qs.getQuestVars().setQuestVar(1);
77
				qs.setQuestVar(1);
78
				qs.setStatus(QuestStatus.REWARD);
78
				qs.setStatus(QuestStatus.REWARD);
79
				updateQuestStatus(player, qs);
79
				updateQuestStatus(player, qs);
80
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);
80
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/eltnen/_1314Anelimoutofwater.java Download diff

15071508
67
		}
67
		}
68
		else if(targetId == 730021)
68
		else if(targetId == 730021)
69
		{
69
		{
70
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 0)
70
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 0)
71
			{
71
			{
72
				if(env.getDialogId() == 25)
72
				if(env.getDialogId() == 25)
73
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
73
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
74
				else if(env.getDialogId() == 10000)
74
				else if(env.getDialogId() == 10000)
75
				{
75
				{
76
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
76
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
77
					updateQuestStatus(player, qs);
77
					updateQuestStatus(player, qs);
78
					PacketSendUtility
78
					PacketSendUtility
79
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
79
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
91
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
91
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
92
				else if(env.getDialogId() == 1009)
92
				else if(env.getDialogId() == 1009)
93
				{
93
				{
94
					qs.getQuestVars().setQuestVar(2);
94
					qs.setQuestVar(2);
95
					qs.setStatus(QuestStatus.REWARD);
95
					qs.setStatus(QuestStatus.REWARD);
96
					updateQuestStatus(player, qs);
96
					updateQuestStatus(player, qs);
97
					return defaultQuestEndDialog(env);
97
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/heiron/_1500OrdersFromPerento.java Download diff

15071508
74
		{
74
		{
75
			if(env.getDialogId() == 25)
75
			if(env.getDialogId() == 25)
76
			{
76
			{
77
				qs.getQuestVars().setQuestVar(1);
77
				qs.setQuestVar(1);
78
				qs.setStatus(QuestStatus.REWARD);
78
				qs.setStatus(QuestStatus.REWARD);
79
				updateQuestStatus(player, qs);
79
				updateQuestStatus(player, qs);
80
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);
80
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ishalgen/_2001ThinkingAhead.java Download diff

15071508
70
		if(qs == null)
70
		if(qs == null)
71
			return false;
71
			return false;
72
72
73
		int var = qs.getQuestVars().getQuestVarById(0);
73
		int var = qs.getQuestVarById(0);
74
		int targetId = 0;
74
		int targetId = 0;
75
		if(env.getVisibleObject() instanceof Npc)
75
		if(env.getVisibleObject() instanceof Npc)
76
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
76
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
92
					case 10002:
92
					case 10002:
93
						if(var == 0 || var == 2)
93
						if(var == 0 || var == 2)
94
						{
94
						{
95
							qs.getQuestVars().setQuestVarById(0, var + 1);
95
							qs.setQuestVarById(0, var + 1);
96
							updateQuestStatus(player, qs);
96
							updateQuestStatus(player, qs);
97
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
97
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
98
							return true;
98
							return true;
...
...
102
						{
102
						{
103
							if(collectItemCheck(env))
103
							if(collectItemCheck(env))
104
							{
104
							{
105
								qs.getQuestVars().setQuestVarById(0, var + 1);
105
								qs.setQuestVarById(0, var + 1);
106
								updateQuestStatus(player, qs);
106
								updateQuestStatus(player, qs);
107
								return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1694);
107
								return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1694);
108
							}
108
							}
...
...
138
		if(qs == null)
138
		if(qs == null)
139
			return false;
139
			return false;
140
140
141
		int var = qs.getQuestVars().getQuestVarById(0);
141
		int var = qs.getQuestVarById(0);
142
		int targetId = 0;
142
		int targetId = 0;
143
		if(env.getVisibleObject() instanceof Npc)
143
		if(env.getVisibleObject() instanceof Npc)
144
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
144
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
151
			case 210369:
151
			case 210369:
152
				if(var >= 3 && var < 8)
152
				if(var >= 3 && var < 8)
153
				{
153
				{
154
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
154
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
155
					updateQuestStatus(player, qs);
155
					updateQuestStatus(player, qs);
156
					return true;
156
					return true;
157
				}
157
				}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ishalgen/_2100OrderoftheCaptain.java Download diff

15071508
61
		{
61
		{
62
			if(env.getDialogId() == 25)
62
			if(env.getDialogId() == 25)
63
			{
63
			{
64
				qs.getQuestVars().setQuestVar(1);
64
				qs.setQuestVar(1);
65
				qs.setStatus(QuestStatus.REWARD);
65
				qs.setStatus(QuestStatus.REWARD);
66
				updateQuestStatus(player, qs);
66
				updateQuestStatus(player, qs);
67
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);
67
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ishalgen/_2107ReturntoSender.java Download diff

15071508
69
		}
69
		}
70
		else if(targetId == 203516)
70
		else if(targetId == 203516)
71
		{
71
		{
72
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 0)
72
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 0)
73
			{
73
			{
74
				if(env.getDialogId() == 25)
74
				if(env.getDialogId() == 25)
75
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
75
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
76
				else if(env.getDialogId() == 10000)
76
				else if(env.getDialogId() == 10000)
77
				{
77
				{
78
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
78
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
79
					updateQuestStatus(player, qs);
79
					updateQuestStatus(player, qs);
80
					PacketSendUtility
80
					PacketSendUtility
81
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
81
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
93
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
93
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
94
				else if(env.getDialogId() == 1009)
94
				else if(env.getDialogId() == 1009)
95
				{
95
				{
96
					qs.getQuestVars().setQuestVar(2);
96
					qs.setQuestVar(2);
97
					qs.setStatus(QuestStatus.REWARD);
97
					qs.setStatus(QuestStatus.REWARD);
98
					player.getInventory().removeFromBagByItemId(182203107, 1);
98
					player.getInventory().removeFromBagByItemId(182203107, 1);
99
					updateQuestStatus(player, qs);
99
					updateQuestStatus(player, qs);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ishalgen/_2132ANewSkill.java Download diff

15071508
64
			switch(player.getCommonData().getPlayerClass())
64
			switch(player.getCommonData().getPlayerClass())
65
			{
65
			{
66
				case WARRIOR:
66
				case WARRIOR:
67
					qs.getQuestVars().setQuestVar(1);
67
					qs.setQuestVar(1);
68
					break;
68
					break;
69
				case SCOUT:
69
				case SCOUT:
70
					qs.getQuestVars().setQuestVar(2);
70
					qs.setQuestVar(2);
71
					break;
71
					break;
72
				case MAGE:
72
				case MAGE:
73
					qs.getQuestVars().setQuestVar(3);
73
					qs.setQuestVar(3);
74
					break;
74
					break;
75
				case PRIEST:
75
				case PRIEST:
76
					qs.getQuestVars().setQuestVar(4);
76
					qs.setQuestVar(4);
77
					break;
77
					break;
78
			}
78
			}
79
			updateQuestStatus(player, qs);
79
			updateQuestStatus(player, qs);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ishalgen/_2135ForLoveofNegi.java Download diff

15071508
83
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
83
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
84
				else if(env.getDialogId() == 1009)
84
				else if(env.getDialogId() == 1009)
85
				{
85
				{
86
					qs.getQuestVars().setQuestVar(2);
86
					qs.setQuestVar(2);
87
					qs.setStatus(QuestStatus.REWARD);
87
					qs.setStatus(QuestStatus.REWARD);
88
					updateQuestStatus(player, qs);
88
					updateQuestStatus(player, qs);
89
					return defaultQuestEndDialog(env);
89
					return defaultQuestEndDialog(env);
...
...
98
		}
98
		}
99
		else if(targetId == 203531)
99
		else if(targetId == 203531)
100
		{
100
		{
101
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 0)
101
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 0)
102
			{
102
			{
103
				if(env.getDialogId() == 25)
103
				if(env.getDialogId() == 25)
104
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
104
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
105
				else if(env.getDialogId() == 10000)
105
				else if(env.getDialogId() == 10000)
106
				{
106
				{
107
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
107
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
108
					player.getInventory().removeFromBagByItemId(182203131, 1);
108
					player.getInventory().removeFromBagByItemId(182203131, 1);
109
					updateQuestStatus(player, qs);
109
					updateQuestStatus(player, qs);
110
					PacketSendUtility
110
					PacketSendUtility

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/morheim/_2316VivisBook.java Download diff

15071508
77
				else if(env.getDialogId() == 1009)
77
				else if(env.getDialogId() == 1009)
78
				{
78
				{
79
					player.getInventory().removeFromBagByItemId(182204115, 1);
79
					player.getInventory().removeFromBagByItemId(182204115, 1);
80
					qs.getQuestVars().setQuestVar(1);
80
					qs.setQuestVar(1);
81
					qs.setStatus(QuestStatus.REWARD);
81
					qs.setStatus(QuestStatus.REWARD);
82
					updateQuestStatus(player, qs);
82
					updateQuestStatus(player, qs);
83
					return defaultQuestEndDialog(env);
83
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1001TheKerubThreat.java Download diff

15071508
56
		if(qs == null)
56
		if(qs == null)
57
			return false;
57
			return false;
58
58
59
		int var = qs.getQuestVars().getQuestVarById(0);
59
		int var = qs.getQuestVarById(0);
60
		int targetId = 0;
60
		int targetId = 0;
61
		if(env.getVisibleObject() instanceof Npc)
61
		if(env.getVisibleObject() instanceof Npc)
62
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
62
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
67
		{
67
		{
68
			if(var > 0 && var < 6)
68
			if(var > 0 && var < 6)
69
			{
69
			{
70
				qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
70
				qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
71
				updateQuestStatus(player, qs);
71
				updateQuestStatus(player, qs);
72
				return true;
72
				return true;
73
			}
73
			}
...
...
95
		if(qs == null)
95
		if(qs == null)
96
			return false;
96
			return false;
97
97
98
		int var = qs.getQuestVars().getQuestVarById(0);
98
		int var = qs.getQuestVarById(0);
99
		int targetId = 0;
99
		int targetId = 0;
100
		if(env.getVisibleObject() instanceof Npc)
100
		if(env.getVisibleObject() instanceof Npc)
101
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
101
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
131
								else
131
								else
132
								{
132
								{
133
									player.getInventory().removeFromBagByItemId(182200001, itemCount);
133
									player.getInventory().removeFromBagByItemId(182200001, itemCount);
134
									qs.getQuestVars().setQuestVarById(0, var + 1);
134
									qs.setQuestVarById(0, var + 1);
135
									qs.setStatus(QuestStatus.REWARD);
135
									qs.setStatus(QuestStatus.REWARD);
136
									updateQuestStatus(player, qs);
136
									updateQuestStatus(player, qs);
137
									PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
137
									PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
...
...
147
					case 10001:
147
					case 10001:
148
						if(var == 0 || var == 6)
148
						if(var == 0 || var == 6)
149
						{
149
						{
150
							qs.getQuestVars().setQuestVarById(0, var + 1);
150
							qs.setQuestVarById(0, var + 1);
151
							updateQuestStatus(player, qs);
151
							updateQuestStatus(player, qs);
152
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
152
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
153
								.getObjectId(), 10));
153
								.getObjectId(), 10));

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1002RequestoftheElim.java Download diff

15071508
92
		if(qs == null)
92
		if(qs == null)
93
			return false;
93
			return false;
94
94
95
		int var = qs.getQuestVars().getQuestVarById(0);
95
		int var = qs.getQuestVarById(0);
96
		int targetId = 0;
96
		int targetId = 0;
97
		if(env.getVisibleObject() instanceof Npc)
97
		if(env.getVisibleObject() instanceof Npc)
98
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
98
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
125
				case 10000:
125
				case 10000:
126
					if(var == 0)
126
					if(var == 0)
127
					{
127
					{
128
						qs.getQuestVars().setQuestVarById(0, var + 1);
128
						qs.setQuestVarById(0, var + 1);
129
						updateQuestStatus(player, qs);
129
						updateQuestStatus(player, qs);
130
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
130
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
131
							10));
131
							10));
...
...
156
					{
156
					{
157
						if(collectItemCheck(env))
157
						if(collectItemCheck(env))
158
						{
158
						{
159
							qs.getQuestVars().setQuestVarById(0, 12);
159
							qs.setQuestVarById(0, 12);
160
							updateQuestStatus(player, qs);
160
							updateQuestStatus(player, qs);
161
							return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2120);
161
							return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2120);
162
						}
162
						}
...
...
176
						if(player.getInventory().getItemCountByItemId(182200002) == 0)
176
						if(player.getInventory().getItemCountByItemId(182200002) == 0)
177
							if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182200002, 1))))
177
							if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182200002, 1))))
178
								return true;
178
								return true;
179
						qs.getQuestVars().setQuestVarById(0, var + 1);
179
						qs.setQuestVarById(0, var + 1);
180
						updateQuestStatus(player, qs);
180
						updateQuestStatus(player, qs);
181
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
181
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
182
							10));
182
							10));
...
...
186
				case 10002:
186
				case 10002:
187
					if(var == 5)
187
					if(var == 5)
188
					{
188
					{
189
						qs.getQuestVars().setQuestVarById(0, var + 1);
189
						qs.setQuestVarById(0, var + 1);
190
						updateQuestStatus(player, qs);
190
						updateQuestStatus(player, qs);
191
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
191
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
192
							10));
192
							10));
...
...
196
				case 10003:
196
				case 10003:
197
					if(var == 12)
197
					if(var == 12)
198
					{
198
					{
199
						qs.getQuestVars().setQuestVarById(0, var + 1);
199
						qs.setQuestVarById(0, var + 1);
200
						updateQuestStatus(player, qs);
200
						updateQuestStatus(player, qs);
201
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
201
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
202
							10));
202
							10));
...
...
237
				case 25:
237
				case 25:
238
					if(var == 2)
238
					if(var == 2)
239
						var++;
239
						var++;
240
					qs.getQuestVars().setQuestVarById(0, var + 1);
240
					qs.setQuestVarById(0, var + 1);
241
					updateQuestStatus(player, qs);
241
					updateQuestStatus(player, qs);
242
					PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
242
					PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
243
					((Npc) env.getVisibleObject()).getController().onDie();
243
					((Npc) env.getVisibleObject()).getController().onDie();
...
...
267
				case 10004:
267
				case 10004:
268
					if(var == 13)
268
					if(var == 13)
269
					{
269
					{
270
						qs.getQuestVars().setQuestVarById(0, 20);
270
						qs.setQuestVarById(0, 20);
271
						updateQuestStatus(player, qs);
271
						updateQuestStatus(player, qs);
272
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
272
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
273
							0));
273
							0));
...
...
303
							@Override
303
							@Override
304
							public void run()
304
							public void run()
305
							{
305
							{
306
								qs.getQuestVars().setQuestVarById(0, 14);
306
								qs.setQuestVarById(0, 14);
307
								updateQuestStatus(player, qs);
307
								updateQuestStatus(player, qs);
308
								teleportService.teleportTo(player, 210010000, 1, 603, 1537, 116, (byte) 20, 0);
308
								teleportService.teleportTo(player, 210010000, 1, 603, 1537, 116, (byte) 20, 0);
309
							}
309
							}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1003IllegalLogging.java Download diff

15071508
69
		if(qs == null)
69
		if(qs == null)
70
			return false;
70
			return false;
71
71
72
		int var = qs.getQuestVars().getQuestVarById(0);
72
		int var = qs.getQuestVarById(0);
73
		int targetId = 0;
73
		int targetId = 0;
74
		if(env.getVisibleObject() instanceof Npc)
74
		if(env.getVisibleObject() instanceof Npc)
75
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
75
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
90
					case 10001:
90
					case 10001:
91
						if (var == 0 || var == 13)
91
						if (var == 0 || var == 13)
92
						{
92
						{
93
							qs.getQuestVars().setQuestVarById(0, var + 1);
93
							qs.setQuestVarById(0, var + 1);
94
							updateQuestStatus(player, qs);
94
							updateQuestStatus(player, qs);
95
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
95
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
96
							return true;
96
							return true;
...
...
113
		if(qs == null)
113
		if(qs == null)
114
			return false;
114
			return false;
115
115
116
		int var = qs.getQuestVars().getQuestVarById(0);
116
		int var = qs.getQuestVarById(0);
117
		int targetId = 0;
117
		int targetId = 0;
118
		if(env.getVisibleObject() instanceof Npc)
118
		if(env.getVisibleObject() instanceof Npc)
119
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
119
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
131
			case 210092:
131
			case 210092:
132
				if (var >=1 && var <=13)
132
				if (var >=1 && var <=13)
133
				{
133
				{
134
					qs.getQuestVars().setQuestVarById(0, var + 1);
134
					qs.setQuestVarById(0, var + 1);
135
					updateQuestStatus(player, qs);
135
					updateQuestStatus(player, qs);
136
					return true;
136
					return true;
137
				}
137
				}
138
			case 210160:
138
			case 210160:
139
				if (var >=14 && var <=15)
139
				if (var >=14 && var <=15)
140
				{
140
				{
141
					qs.getQuestVars().setQuestVarById(0, var + 1);
141
					qs.setQuestVarById(0, var + 1);
142
					updateQuestStatus(player, qs);
142
					updateQuestStatus(player, qs);
143
					return true;
143
					return true;
144
				}
144
				}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1004NeutralizingOdium.java Download diff

15071508
68
		if(qs == null)
68
		if(qs == null)
69
			return false;
69
			return false;
70
70
71
		int var = qs.getQuestVars().getQuestVarById(0);
71
		int var = qs.getQuestVarById(0);
72
		int targetId = 0;
72
		int targetId = 0;
73
		if(env.getVisibleObject() instanceof Npc)
73
		if(env.getVisibleObject() instanceof Npc)
74
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
74
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
92
						if(player.getInventory().getItemCountByItemId(182200005) == 0)
92
						if(player.getInventory().getItemCountByItemId(182200005) == 0)
93
							if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182200005, 1))))
93
							if (!itemService.addItems(player, Collections.singletonList(new QuestItems(182200005, 1))))
94
								return true;
94
								return true;
95
						qs.getQuestVars().setQuestVarById(0, var + 1);
95
						qs.setQuestVarById(0, var + 1);
96
						updateQuestStatus(player, qs);
96
						updateQuestStatus(player, qs);
97
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
97
						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
98
							.getObjectId(), 10));
98
							.getObjectId(), 10));
...
...
129
								PacketSendUtility.broadcastPacket(player, new SM_EMOTION(player, 38, 0,
129
								PacketSendUtility.broadcastPacket(player, new SM_EMOTION(player, 38, 0,
130
									targetObjectId), true);
130
									targetObjectId), true);
131
								QuestState qs = player.getQuestStateList().getQuestState(questId);
131
								QuestState qs = player.getQuestStateList().getQuestState(questId);
132
								qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0)+1);
132
								qs.setQuestVarById(0, qs.getQuestVarById(0)+1);
133
								updateQuestStatus(player, qs);
133
								updateQuestStatus(player, qs);
134
								player.getInventory().removeFromBagByItemId(182200005, 1);
134
								player.getInventory().removeFromBagByItemId(182200005, 1);
135
								PacketSendUtility.broadcastPacket(player.getTarget(), new SM_EMOTION((Creature)player.getTarget(), 16, 128, 0));
135
								PacketSendUtility.broadcastPacket(player.getTarget(), new SM_EMOTION((Creature)player.getTarget(), 16, 128, 0));
...
...
152
					case 10001:
152
					case 10001:
153
						if(var == 2)
153
						if(var == 2)
154
						{
154
						{
155
							qs.getQuestVars().setQuestVarById(0, var + 1);
155
							qs.setQuestVarById(0, var + 1);
156
							updateQuestStatus(player, qs);
156
							updateQuestStatus(player, qs);
157
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
157
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
158
								.getObjectId(), 10));
158
								.getObjectId(), 10));
...
...
161
					case 10002:
161
					case 10002:
162
						if(var == 11)
162
						if(var == 11)
163
						{
163
						{
164
							qs.getQuestVars().setQuestVarById(0, 4);
164
							qs.setQuestVarById(0, 4);
165
							updateQuestStatus(player, qs);
165
							updateQuestStatus(player, qs);
166
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
166
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
167
								.getObjectId(), 10));
167
								.getObjectId(), 10));
...
...
171
						{
171
						{
172
							if(collectItemCheck(env))
172
							if(collectItemCheck(env))
173
							{
173
							{
174
								qs.getQuestVars().setQuestVarById(0, 11);
174
								qs.setQuestVarById(0, 11);
175
								updateQuestStatus(player, qs);
175
								updateQuestStatus(player, qs);
176
								return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1694);
176
								return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1694);
177
							}
177
							}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1005BarringtheGate.java Download diff

15071508
60
		if(qs == null)
60
		if(qs == null)
61
			return false;
61
			return false;
62
62
63
		int var = qs.getQuestVars().getQuestVarById(0);
63
		int var = qs.getQuestVarById(0);
64
		int targetId = 0;
64
		int targetId = 0;
65
		if(env.getVisibleObject() instanceof Npc)
65
		if(env.getVisibleObject() instanceof Npc)
66
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
66
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
77
					case 10000:
77
					case 10000:
78
						if(var == 0)
78
						if(var == 0)
79
						{
79
						{
80
							qs.getQuestVars().setQuestVarById(0, var + 1);
80
							qs.setQuestVarById(0, var + 1);
81
							updateQuestStatus(player, qs);
81
							updateQuestStatus(player, qs);
82
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
82
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
83
							.getObjectId(), 10));
83
							.getObjectId(), 10));
...
...
95
					case 10001:
95
					case 10001:
96
						if(var == 1)
96
						if(var == 1)
97
						{
97
						{
98
							qs.getQuestVars().setQuestVarById(0, var + 1);
98
							qs.setQuestVarById(0, var + 1);
99
							updateQuestStatus(player, qs);
99
							updateQuestStatus(player, qs);
100
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
100
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
101
							.getObjectId(), 10));
101
							.getObjectId(), 10));
...
...
113
					case 10002:
113
					case 10002:
114
						if(var == 2)
114
						if(var == 2)
115
						{
115
						{
116
							qs.getQuestVars().setQuestVarById(0, var + 1);
116
							qs.setQuestVarById(0, var + 1);
117
							updateQuestStatus(player, qs);
117
							updateQuestStatus(player, qs);
118
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
118
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
119
							.getObjectId(), 10));
119
							.getObjectId(), 10));
...
...
131
					case 10002:
131
					case 10002:
132
						if(var == 3)
132
						if(var == 3)
133
						{
133
						{
134
							qs.getQuestVars().setQuestVarById(0, var + 1);
134
							qs.setQuestVarById(0, var + 1);
135
							updateQuestStatus(player, qs);
135
							updateQuestStatus(player, qs);
136
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
136
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
137
							.getObjectId(), 10));
137
							.getObjectId(), 10));
...
...
149
					case 10002:
149
					case 10002:
150
						if(var == 4)
150
						if(var == 4)
151
						{
151
						{
152
							qs.getQuestVars().setQuestVarById(0, var + 1);
152
							qs.setQuestVarById(0, var + 1);
153
							updateQuestStatus(player, qs);
153
							updateQuestStatus(player, qs);
154
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
154
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
155
							.getObjectId(), 10));
155
							.getObjectId(), 10));
...
...
240
				PacketSendUtility.broadcastPacket(player.getTarget(), new SM_EMOTION((Creature)player.getTarget(), 16, 128, 0));
240
				PacketSendUtility.broadcastPacket(player.getTarget(), new SM_EMOTION((Creature)player.getTarget(), 16, 128, 0));
241
				QuestState qs = player.getQuestStateList().getQuestState(questId);
241
				QuestState qs = player.getQuestStateList().getQuestState(questId);
242
				if (var != -1)
242
				if (var != -1)
243
					qs.getQuestVars().setQuestVarById(0, var);
243
					qs.setQuestVarById(0, var);
244
				else
244
				else
245
					qs.setStatus(QuestStatus.REWARD);
245
					qs.setStatus(QuestStatus.REWARD);
246
				updateQuestStatus(player, qs);
246
				updateQuestStatus(player, qs);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1100KaliosCall.java Download diff

15071508
62
		{
62
		{
63
			if(env.getDialogId() == 25)
63
			if(env.getDialogId() == 25)
64
			{
64
			{
65
				qs.getQuestVars().setQuestVar(1);
65
				qs.setQuestVar(1);
66
				qs.setStatus(QuestStatus.REWARD);
66
				qs.setStatus(QuestStatus.REWARD);
67
				updateQuestStatus(player, qs);
67
				updateQuestStatus(player, qs);
68
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);
68
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1107TheLostAxe.java Download diff

15071508
77
				else if(env.getDialogId() == 1009)
77
				else if(env.getDialogId() == 1009)
78
				{
78
				{
79
					player.getInventory().removeFromBagByItemId(182200501, 1);
79
					player.getInventory().removeFromBagByItemId(182200501, 1);
80
					qs.getQuestVars().setQuestVar(1);
80
					qs.setQuestVar(1);
81
					qs.setStatus(QuestStatus.REWARD);
81
					qs.setStatus(QuestStatus.REWARD);
82
					updateQuestStatus(player, qs);
82
					updateQuestStatus(player, qs);
83
					return defaultQuestEndDialog(env);
83
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1111InsomniaMedicine.java Download diff

15071508
54
		if(env.getVisibleObject() instanceof Npc)
54
		if(env.getVisibleObject() instanceof Npc)
55
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
55
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
56
		QuestState qs = player.getQuestStateList().getQuestState(questId);
56
		QuestState qs = player.getQuestStateList().getQuestState(questId);
57
		int var = qs.getQuestVarById(0);
57
		if(targetId == 203075)
58
		if(targetId == 203075)
58
		{
59
		{
59
			if(qs == null)
60
			if(qs == null)
...
...
67
			{
68
			{
68
				if(env.getDialogId() == -1)
69
				if(env.getDialogId() == -1)
69
				{
70
				{
70
					if(qs.getQuestVars().getQuestVarById(0) == 2)
71
					if(var == 2)
71
						return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
72
						return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
72
					else if(qs.getQuestVars().getQuestVarById(0) == 3)
73
					else if(var == 3)
73
						return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2716);
74
						return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2716);
74
					return false;
75
					return false;
75
				}
76
				}
76
				else if(env.getDialogId() == 1009)
77
				else if(env.getDialogId() == 1009)
77
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), qs.getQuestVars()
78
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), var + 3);
78
						.getQuestVarById(0) + 3);
79
				else if(env.getDialogId() == 17)
79
				else if(env.getDialogId() == 17)
80
				{
80
				{
81
					questService.questFinish(env, qs.getQuestVars().getQuestVarById(0) - 2);
81
					questService.questFinish(env, var - 2);
82
					PacketSendUtility
82
					PacketSendUtility
83
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
83
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
84
					return true;
84
					return true;
...
...
89
		{
89
		{
90
			if(env.getDialogId() == 25)
90
			if(env.getDialogId() == 25)
91
			{
91
			{
92
				if(qs.getQuestVars().getQuestVarById(0) == 0)
92
				if(var == 0)
93
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
93
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
94
				else if(qs.getQuestVars().getQuestVarById(0) == 1)
94
				else if(var == 1)
95
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1353);
95
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1353);
96
				return false;
96
				return false;
97
			}
97
			}
...
...
99
			{
99
			{
100
				if(collectItemCheck(env))
100
				if(collectItemCheck(env))
101
				{
101
				{
102
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
102
					qs.setQuestVarById(0, var + 1);
103
					updateQuestStatus(player, qs);
103
					updateQuestStatus(player, qs);
104
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1353);
104
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1353);
105
				}
105
				}
...
...
108
			}
108
			}
109
			else if(env.getDialogId() == 10000 || env.getDialogId() == 10001)
109
			else if(env.getDialogId() == 10000 || env.getDialogId() == 10001)
110
			{
110
			{
111
				qs.getQuestVars().setQuestVarById(0, env.getDialogId() - 10000 + 2);
111
				qs.setQuestVarById(0, env.getDialogId() - 10000 + 2);
112
				qs.setStatus(QuestStatus.REWARD);
112
				qs.setStatus(QuestStatus.REWARD);
113
				updateQuestStatus(player, qs);
113
				updateQuestStatus(player, qs);
114
				PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
114
				PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1115TheElimsMessage.java Download diff

15071508
67
		}
67
		}
68
		else if(targetId == 203072)
68
		else if(targetId == 203072)
69
		{
69
		{
70
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 0)
70
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 0)
71
			{
71
			{
72
				if(env.getDialogId() == 25)
72
				if(env.getDialogId() == 25)
73
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
73
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
74
				else if(env.getDialogId() == 10000)
74
				else if(env.getDialogId() == 10000)
75
				{
75
				{
76
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
76
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
77
					updateQuestStatus(player, qs);
77
					updateQuestStatus(player, qs);
78
					PacketSendUtility
78
					PacketSendUtility
79
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
79
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
91
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
91
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
92
				else if(env.getDialogId() == 1009)
92
				else if(env.getDialogId() == 1009)
93
				{
93
				{
94
					qs.getQuestVars().setQuestVar(2);
94
					qs.setQuestVar(2);
95
					qs.setStatus(QuestStatus.REWARD);
95
					qs.setStatus(QuestStatus.REWARD);
96
					updateQuestStatus(player, qs);
96
					updateQuestStatus(player, qs);
97
					return defaultQuestEndDialog(env);
97
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1122DeliveringPernossRobe.java Download diff

15071508
91
						itemCount = player.getInventory().getItemCountByItemId(182200218);
91
						itemCount = player.getInventory().getItemCountByItemId(182200218);
92
						if (itemCount > 0)
92
						if (itemCount > 0)
93
						{
93
						{
94
							qs.getQuestVars().setQuestVar(3);
94
							qs.setQuestVar(3);
95
							qs.setStatus(QuestStatus.REWARD);
95
							qs.setStatus(QuestStatus.REWARD);
96
							updateQuestStatus(player, qs);
96
							updateQuestStatus(player, qs);
97
							player.getInventory().removeFromBagByItemId(182200218, 1);
97
							player.getInventory().removeFromBagByItemId(182200218, 1);
...
...
104
						itemCount = player.getInventory().getItemCountByItemId(182200219);
104
						itemCount = player.getInventory().getItemCountByItemId(182200219);
105
						if (itemCount > 0)
105
						if (itemCount > 0)
106
						{
106
						{
107
							qs.getQuestVars().setQuestVar(2);
107
							qs.setQuestVar(2);
108
							qs.setStatus(QuestStatus.REWARD);
108
							qs.setStatus(QuestStatus.REWARD);
109
							updateQuestStatus(player, qs);
109
							updateQuestStatus(player, qs);
110
							player.getInventory().removeFromBagByItemId(182200219, 1);
110
							player.getInventory().removeFromBagByItemId(182200219, 1);
...
...
116
						itemCount = player.getInventory().getItemCountByItemId(182200220);
116
						itemCount = player.getInventory().getItemCountByItemId(182200220);
117
						if (itemCount > 0)
117
						if (itemCount > 0)
118
						{
118
						{
119
							qs.getQuestVars().setQuestVar(1);
119
							qs.setQuestVar(1);
120
							qs.setStatus(QuestStatus.REWARD);
120
							qs.setStatus(QuestStatus.REWARD);
121
							updateQuestStatus(player, qs);
121
							updateQuestStatus(player, qs);
122
							player.getInventory().removeFromBagByItemId(182200220, 1);
122
							player.getInventory().removeFromBagByItemId(182200220, 1);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1123WheresTutty.java Download diff

15071508
82
		env.setQuestId(questId);
82
		env.setQuestId(questId);
83
		PacketSendUtility.sendPacket(player, new SM_PLAY_MOVIE(0, 11));
83
		PacketSendUtility.sendPacket(player, new SM_PLAY_MOVIE(0, 11));
84
		qs.setStatus(QuestStatus.REWARD);
84
		qs.setStatus(QuestStatus.REWARD);
85
		qs.getQuestVars().setQuestVarById(0, 1);
85
		qs.setQuestVarById(0, 1);
86
		updateQuestStatus(player, qs);
86
		updateQuestStatus(player, qs);
87
		return true;
87
		return true;
88
	}
88
	}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1205ANewSkill.java Download diff

15071508
64
			switch(player.getCommonData().getPlayerClass())
64
			switch(player.getCommonData().getPlayerClass())
65
			{
65
			{
66
				case WARRIOR:
66
				case WARRIOR:
67
					qs.getQuestVars().setQuestVar(1);
67
					qs.setQuestVar(1);
68
					break;
68
					break;
69
				case SCOUT:
69
				case SCOUT:
70
					qs.getQuestVars().setQuestVar(2);
70
					qs.setQuestVar(2);
71
					break;
71
					break;
72
				case MAGE:
72
				case MAGE:
73
					qs.getQuestVars().setQuestVar(3);
73
					qs.setQuestVar(3);
74
					break;
74
					break;
75
				case PRIEST:
75
				case PRIEST:
76
					qs.getQuestVars().setQuestVar(4);
76
					qs.setQuestVar(4);
77
					break;
77
					break;
78
			}
78
			}
79
			updateQuestStatus(player, qs);
79
			updateQuestStatus(player, qs);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/sanctum/_1900RingImbuedAether.java Download diff

15071508
70
		}
70
		}
71
		else if(targetId == 203739)
71
		else if(targetId == 203739)
72
		{
72
		{
73
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 0)
73
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 0)
74
			{
74
			{
75
				if(env.getDialogId() == 25)
75
				if(env.getDialogId() == 25)
76
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
76
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
77
				else if(env.getDialogId() == 10000)
77
				else if(env.getDialogId() == 10000)
78
				{
78
				{
79
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
79
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
80
					updateQuestStatus(player, qs);
80
					updateQuestStatus(player, qs);
81
					PacketSendUtility
81
					PacketSendUtility
82
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
82
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
88
		}
88
		}
89
		else if(targetId == 203766)
89
		else if(targetId == 203766)
90
		{
90
		{
91
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 1)
91
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 1)
92
			{
92
			{
93
				if(env.getDialogId() == 25)
93
				if(env.getDialogId() == 25)
94
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
94
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
95
				else if(env.getDialogId() == 10000)
95
				else if(env.getDialogId() == 10000)
96
				{
96
				{
97
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
97
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
98
					updateQuestStatus(player, qs);
98
					updateQuestStatus(player, qs);
99
					PacketSendUtility
99
					PacketSendUtility
100
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
100
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
106
		}
106
		}
107
		else if(targetId == 203797)
107
		else if(targetId == 203797)
108
		{
108
		{
109
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 2)
109
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 2)
110
			{
110
			{
111
				if(env.getDialogId() == 25)
111
				if(env.getDialogId() == 25)
112
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
112
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
113
				else if(env.getDialogId() == 10000)
113
				else if(env.getDialogId() == 10000)
114
				{
114
				{
115
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
115
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
116
					updateQuestStatus(player, qs);
116
					updateQuestStatus(player, qs);
117
					PacketSendUtility
117
					PacketSendUtility
118
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
118
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
124
		}
124
		}
125
		else if(targetId == 203795)
125
		else if(targetId == 203795)
126
		{
126
		{
127
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 3)
127
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 3)
128
			{
128
			{
129
				if(env.getDialogId() == 25)
129
				if(env.getDialogId() == 25)
130
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
130
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
131
				else if(env.getDialogId() == 10000)
131
				else if(env.getDialogId() == 10000)
132
				{
132
				{
133
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
133
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
134
					updateQuestStatus(player, qs);
134
					updateQuestStatus(player, qs);
135
					qs.setStatus(QuestStatus.REWARD);
135
					qs.setStatus(QuestStatus.REWARD);
136
					PacketSendUtility
136
					PacketSendUtility
...
...
149
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
149
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
150
				else if(env.getDialogId() == 1009)
150
				else if(env.getDialogId() == 1009)
151
				{
151
				{
152
					qs.getQuestVars().setQuestVar(4);
152
					qs.setQuestVar(4);
153
					qs.setStatus(QuestStatus.REWARD);
153
					qs.setStatus(QuestStatus.REWARD);
154
					updateQuestStatus(player, qs);
154
					updateQuestStatus(player, qs);
155
					return defaultQuestEndDialog(env);
155
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/sanctum/_1928ChasingaCriminal.java Download diff

15071508
68
		}
68
		}
69
		else if(targetId == 203063)
69
		else if(targetId == 203063)
70
		{
70
		{
71
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 0)
71
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 0)
72
			{
72
			{
73
				if(env.getDialogId() == 25)
73
				if(env.getDialogId() == 25)
74
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
74
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
75
				else if(env.getDialogId() == 10000)
75
				else if(env.getDialogId() == 10000)
76
				{
76
				{
77
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
77
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
78
					updateQuestStatus(player, qs);
78
					updateQuestStatus(player, qs);
79
					PacketSendUtility
79
					PacketSendUtility
80
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
80
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
86
		}
86
		}
87
		else if(targetId == 203170)
87
		else if(targetId == 203170)
88
		{
88
		{
89
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 1)
89
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 1)
90
			{
90
			{
91
				if(env.getDialogId() == 25)
91
				if(env.getDialogId() == 25)
92
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
92
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
93
				else if(env.getDialogId() == 10000)
93
				else if(env.getDialogId() == 10000)
94
				{
94
				{
95
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
95
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
96
					updateQuestStatus(player, qs);
96
					updateQuestStatus(player, qs);
97
					PacketSendUtility
97
					PacketSendUtility
98
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
98
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
110
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
110
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
111
				else if(env.getDialogId() == 1009)
111
				else if(env.getDialogId() == 1009)
112
				{
112
				{
113
					qs.getQuestVars().setQuestVar(2);
113
					qs.setQuestVar(2);
114
					qs.setStatus(QuestStatus.REWARD);
114
					qs.setStatus(QuestStatus.REWARD);
115
					updateQuestStatus(player, qs);
115
					updateQuestStatus(player, qs);
116
					return defaultQuestEndDialog(env);
116
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1011DangerFromAbove.java Download diff

15071508
57
		if(qs == null)
57
		if(qs == null)
58
			return false;
58
			return false;
59
59
60
		int var = qs.getQuestVars().getQuestVarById(0);
60
		int var = qs.getQuestVarById(0);
61
		int targetId = 0;
61
		int targetId = 0;
62
		if(env.getVisibleObject() instanceof Npc)
62
		if(env.getVisibleObject() instanceof Npc)
63
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
63
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
68
		{
68
		{
69
			if(var > 0 && var < 4)
69
			if(var > 0 && var < 4)
70
			{
70
			{
71
				qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
71
				qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
72
				updateQuestStatus(player, qs);
72
				updateQuestStatus(player, qs);
73
				return true;
73
				return true;
74
			}
74
			}
...
...
91
		if(qs == null)
91
		if(qs == null)
92
			return false;
92
			return false;
93
93
94
		int var = qs.getQuestVars().getQuestVarById(0);
94
		int var = qs.getQuestVarById(0);
95
		int targetId = 0;
95
		int targetId = 0;
96
		if(env.getVisibleObject() instanceof Npc)
96
		if(env.getVisibleObject() instanceof Npc)
97
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
97
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
108
					case 10000:
108
					case 10000:
109
						if(var == 0)
109
						if(var == 0)
110
						{
110
						{
111
							qs.getQuestVars().setQuestVarById(0, var + 1);
111
							qs.setQuestVarById(0, var + 1);
112
							updateQuestStatus(player, qs);
112
							updateQuestStatus(player, qs);
113
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
113
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
114
								.getObjectId(), 10));
114
								.getObjectId(), 10));
...
...
126
					case 10001:
126
					case 10001:
127
						if(var == 1)
127
						if(var == 1)
128
						{
128
						{
129
							qs.getQuestVars().setQuestVarById(0, var + 1);
129
							qs.setQuestVarById(0, var + 1);
130
							updateQuestStatus(player, qs);
130
							updateQuestStatus(player, qs);
131
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
131
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
132
								.getObjectId(), 10));
132
								.getObjectId(), 10));

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1013HuntingLepharistRevolutionaries.java Download diff

15071508
69
		if(qs == null)
69
		if(qs == null)
70
			return false;
70
			return false;
71
71
72
		int var = qs.getQuestVars().getQuestVarById(0);
72
		int var = qs.getQuestVarById(0);
73
		int targetId = 0;
73
		int targetId = 0;
74
		if(env.getVisibleObject() instanceof Npc)
74
		if(env.getVisibleObject() instanceof Npc)
75
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
75
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
95
					case 10001:
95
					case 10001:
96
						if(var == 0 || var == 11)
96
						if(var == 0 || var == 11)
97
						{
97
						{
98
							qs.getQuestVars().setQuestVarById(0, var + 1);
98
							qs.setQuestVarById(0, var + 1);
99
							updateQuestStatus(player, qs);
99
							updateQuestStatus(player, qs);
100
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
100
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
101
								.getObjectId(), 10));
101
								.getObjectId(), 10));
...
...
120
		if(qs == null)
120
		if(qs == null)
121
			return false;
121
			return false;
122
122
123
		int var = qs.getQuestVars().getQuestVarById(0);
123
		int var = qs.getQuestVarById(0);
124
		int targetId = 0;
124
		int targetId = 0;
125
		if(env.getVisibleObject() instanceof Npc)
125
		if(env.getVisibleObject() instanceof Npc)
126
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
126
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
132
			case 210688:
132
			case 210688:
133
				if(var >= 1 && var <= 11)
133
				if(var >= 1 && var <= 11)
134
				{
134
				{
135
					qs.getQuestVars().setQuestVarById(0, var + 1);
135
					qs.setQuestVarById(0, var + 1);
136
					updateQuestStatus(player, qs);
136
					updateQuestStatus(player, qs);
137
					return true;
137
					return true;
138
				}
138
				}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1015FrillneckHunt.java Download diff

15071508
69
		if(qs == null)
69
		if(qs == null)
70
			return false;
70
			return false;
71
71
72
		int var = qs.getQuestVars().getQuestVarById(0);
72
		int var = qs.getQuestVarById(0);
73
		int targetId = 0;
73
		int targetId = 0;
74
		if(env.getVisibleObject() instanceof Npc)
74
		if(env.getVisibleObject() instanceof Npc)
75
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
75
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
95
					case 10001:
95
					case 10001:
96
						if(var == 0 || var == 8)
96
						if(var == 0 || var == 8)
97
						{
97
						{
98
							qs.getQuestVars().setQuestVarById(0, var + 1);
98
							qs.setQuestVarById(0, var + 1);
99
							updateQuestStatus(player, qs);
99
							updateQuestStatus(player, qs);
100
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
100
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
101
								.getObjectId(), 10));
101
								.getObjectId(), 10));
...
...
120
		if(qs == null || qs.getStatus() != QuestStatus.START)
120
		if(qs == null || qs.getStatus() != QuestStatus.START)
121
			return false;
121
			return false;
122
122
123
		int var = qs.getQuestVars().getQuestVarById(0);
123
		int var = qs.getQuestVarById(0);
124
		int targetId = 0;
124
		int targetId = 0;
125
		if(env.getVisibleObject() instanceof Npc)
125
		if(env.getVisibleObject() instanceof Npc)
126
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
126
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
129
			case 210126:
129
			case 210126:
130
				if(var >= 1 && var <= 8)
130
				if(var >= 1 && var <= 8)
131
				{
131
				{
132
					qs.getQuestVars().setQuestVarById(0, var + 1);
132
					qs.setQuestVarById(0, var + 1);
133
					updateQuestStatus(player, qs);
133
					updateQuestStatus(player, qs);
134
					return true;
134
					return true;
135
				}
135
				}
136
			case 210200:
136
			case 210200:
137
				if(var >= 9 && var <= 19)
137
				if(var >= 9 && var <= 19)
138
				{
138
				{
139
					qs.getQuestVars().setQuestVarById(0, var + 1);
139
					qs.setQuestVarById(0, var + 1);
140
					updateQuestStatus(player, qs);
140
					updateQuestStatus(player, qs);
141
					return true;
141
					return true;
142
				}
142
				}

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1021TrandilasEggs.java Download diff

15071508
72
		if(qs == null)
72
		if(qs == null)
73
			return false;
73
			return false;
74
74
75
		int var = qs.getQuestVars().getQuestVarById(0);
75
		int var = qs.getQuestVarById(0);
76
		int targetId = 0;
76
		int targetId = 0;
77
		if(env.getVisibleObject() instanceof Npc)
77
		if(env.getVisibleObject() instanceof Npc)
78
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
78
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
...
...
90
					case 10001:
90
					case 10001:
91
						if(var == 0)
91
						if(var == 0)
92
						{
92
						{
93
							qs.getQuestVars().setQuestVarById(0, var + 1);
93
							qs.setQuestVarById(0, var + 1);
94
							updateQuestStatus(player, qs);
94
							updateQuestStatus(player, qs);
95
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
95
							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
96
								.getObjectId(), 10));
96
								.getObjectId(), 10));
...
...
115
		if(qs == null)
115
		if(qs == null)
116
			return false;
116
			return false;
117
117
118
		int var = qs.getQuestVars().getQuestVarById(0);
118
		int var = qs.getQuestVarById(0);
119
		int targetId = 0;
119
		int targetId = 0;
120
		if(env.getVisibleObject() instanceof Npc)
120
		if(env.getVisibleObject() instanceof Npc)
121
			targetId = ((Npc) env.getVisibleObject()).getNpcId();
121
			targetId = ((Npc) env.getVisibleObject()).getNpcId();

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1130SummonstotheCitadel.java Download diff

15071508
62
		{
62
		{
63
			if(env.getDialogId() == 25)
63
			if(env.getDialogId() == 25)
64
			{
64
			{
65
				qs.getQuestVars().setQuestVar(1);
65
				qs.setQuestVar(1);
66
				qs.setStatus(QuestStatus.REWARD);
66
				qs.setStatus(QuestStatus.REWARD);
67
				updateQuestStatus(player, qs);
67
				updateQuestStatus(player, qs);
68
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);
68
				return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1011);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1131UndeliveredArmor.java Download diff

15071508
67
		}
67
		}
68
		else if(targetId == 798001)
68
		else if(targetId == 798001)
69
		{
69
		{
70
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVars().getQuestVarById(0) == 0)
70
			if(qs != null && qs.getStatus() == QuestStatus.START && qs.getQuestVarById(0) == 0)
71
			{
71
			{
72
				if(env.getDialogId() == 25)
72
				if(env.getDialogId() == 25)
73
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
73
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 1352);
74
				else if(env.getDialogId() == 10000)
74
				else if(env.getDialogId() == 10000)
75
				{
75
				{
76
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
76
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
77
					updateQuestStatus(player, qs);
77
					updateQuestStatus(player, qs);
78
					PacketSendUtility
78
					PacketSendUtility
79
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
79
						.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 10));
...
...
91
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
91
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 2375);
92
				else if(env.getDialogId() == 1009)
92
				else if(env.getDialogId() == 1009)
93
				{
93
				{
94
					qs.getQuestVars().setQuestVar(2);
94
					qs.setQuestVar(2);
95
					qs.setStatus(QuestStatus.REWARD);
95
					qs.setStatus(QuestStatus.REWARD);
96
					updateQuestStatus(player, qs);
96
					updateQuestStatus(player, qs);
97
					return defaultQuestEndDialog(env);
97
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1182AncientStoneFragment.java Download diff

15071508
77
				else if(env.getDialogId() == 1009)
77
				else if(env.getDialogId() == 1009)
78
				{
78
				{
79
					player.getInventory().removeFromBagByItemId(182200549, 1);
79
					player.getInventory().removeFromBagByItemId(182200549, 1);
80
					qs.getQuestVars().setQuestVar(1);
80
					qs.setQuestVar(1);
81
					qs.setStatus(QuestStatus.REWARD);
81
					qs.setStatus(QuestStatus.REWARD);
82
					updateQuestStatus(player, qs);
82
					updateQuestStatus(player, qs);
83
					return defaultQuestEndDialog(env);
83
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/data/scripts/system/handlers/quest/verteron/_1197KrallBook.java Download diff

15071508
77
				else if(env.getDialogId() == 1009)
77
				else if(env.getDialogId() == 1009)
78
				{
78
				{
79
					player.getInventory().removeFromBagByItemId(182200558, 1);
79
					player.getInventory().removeFromBagByItemId(182200558, 1);
80
					qs.getQuestVars().setQuestVar(1);
80
					qs.setQuestVar(1);
81
					qs.setStatus(QuestStatus.REWARD);
81
					qs.setStatus(QuestStatus.REWARD);
82
					updateQuestStatus(player, qs);
82
					updateQuestStatus(player, qs);
83
					return defaultQuestEndDialog(env);
83
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/questEngine/handlers/template/ItemCollecting.java Download diff

15071508
92
				{
92
				{
93
					if(collectItemCheck(env))
93
					if(collectItemCheck(env))
94
					{
94
					{
95
						qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
95
						qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
96
						qs.setStatus(QuestStatus.REWARD);
96
						qs.setStatus(QuestStatus.REWARD);
97
						updateQuestStatus(player, qs);
97
						updateQuestStatus(player, qs);
98
						return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 5);
98
						return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 5);

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/questEngine/handlers/template/MonsterHunt.java Download diff

15071508
76
			{
76
			{
77
				for(MonsterInfo mi : monsterInfo.values())
77
				for(MonsterInfo mi : monsterInfo.values())
78
				{
78
				{
79
					if(mi.getMaxKill() < qs.getQuestVars().getQuestVarById(mi.getVarId()))
79
					if(mi.getMaxKill() < qs.getQuestVarById(mi.getVarId()))
80
						return false;
80
						return false;
81
				}
81
				}
82
				if(env.getDialogId() == 25)
82
				if(env.getDialogId() == 25)
...
...
84
				else if(env.getDialogId() == 1009)
84
				else if(env.getDialogId() == 1009)
85
				{
85
				{
86
					qs.setStatus(QuestStatus.REWARD);
86
					qs.setStatus(QuestStatus.REWARD);
87
					qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
87
					qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
88
					updateQuestStatus(player, qs);
88
					updateQuestStatus(player, qs);
89
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 5);
89
					return sendQuestDialog(player, env.getVisibleObject().getObjectId(), 5);
90
				}
90
				}
...
...
116
		MonsterInfo mi = monsterInfo.get(targetId);
116
		MonsterInfo mi = monsterInfo.get(targetId);
117
		if(mi == null)
117
		if(mi == null)
118
			return false;
118
			return false;
119
		if(mi.getMaxKill() <= qs.getQuestVars().getQuestVarById(mi.getVarId()))
119
		if(mi.getMaxKill() <= qs.getQuestVarById(mi.getVarId()))
120
			return false;
120
			return false;
121
121
122
		qs.getQuestVars().setQuestVarById(mi.getVarId(), qs.getQuestVars().getQuestVarById(mi.varId) + 1);
122
		qs.setQuestVarById(mi.getVarId(), qs.getQuestVarById(mi.varId) + 1);
123
		updateQuestStatus(player, qs);
123
		updateQuestStatus(player, qs);
124
		return true;
124
		return true;
125
	}
125
	}

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/questEngine/handlers/template/ReportTo.java Download diff

15071508
97
				{
97
				{
98
					if(itemId != 0)
98
					if(itemId != 0)
99
						player.getInventory().removeFromBagByItemId(itemId, 1);
99
						player.getInventory().removeFromBagByItemId(itemId, 1);
100
					qs.getQuestVars().setQuestVar(1);
100
					qs.setQuestVar(1);
101
					qs.setStatus(QuestStatus.REWARD);
101
					qs.setStatus(QuestStatus.REWARD);
102
					updateQuestStatus(player, qs);
102
					updateQuestStatus(player, qs);
103
					return defaultQuestEndDialog(env);
103
					return defaultQuestEndDialog(env);

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/questEngine/model/QuestState.java Download diff

15071508
53
    	   return questVars;
53
    	   return questVars;
54
       }
54
       }
55
55
56
       /**
57
        * @param id
58
        * @param var
59
        */
60
       public void setQuestVarById(int id, int var)
61
       {
62
    	   questVars.setVarById(id, var);
63
    	   setPersistentState(PersistentState.UPDATE_REQUIRED);
64
       }
65
66
       /**
67
        * @param id
68
        * @return Quest var by id.
69
        */
70
       public int getQuestVarById(int id)
71
       {
72
    	   return questVars.getVarById(id);
73
       }
74
       
75
       public void setQuestVar(int var)
76
       {
77
    	   questVars.setVar(var);
78
    	   setPersistentState(PersistentState.UPDATE_REQUIRED);
79
       }
80
56
       public QuestStatus getStatus()
81
       public QuestStatus getStatus()
57
       {
82
       {
58
    	   return status;
83
    	   return status;

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/questEngine/model/QuestVars.java Download diff

15071508
31
31
32
	public QuestVars(int var)
32
	public QuestVars(int var)
33
	{
33
	{
34
		setQuestVar(var);
34
		setVar(var);
35
	}
35
	}
36
36
37
	/**
37
	/**
38
	 * @param id
38
	 * @param id
39
	 * @return Quest var by id.
39
	 * @return Quest var by id.
40
	 */
40
	 */
41
	public int getQuestVarById(int id)
41
	public int getVarById(int id)
42
	{
42
	{
43
		return questVars[id];
43
		return questVars[id];
44
	}
44
	}
...
...
47
	 * @param id
47
	 * @param id
48
	 * @param var
48
	 * @param var
49
	 */
49
	 */
50
	public void setQuestVarById(int id, int var)
50
	public void setVarById(int id, int var)
51
	{
51
	{
52
		questVars[id] = var;
52
		questVars[id] = var;
53
	}
53
	}
...
...
67
		return var;
67
		return var;
68
	}
68
	}
69
	
69
	
70
	public void setQuestVar(int var)
70
	public void setVar(int var)
71
	{
71
	{
72
		for(int i = 0; i < 5; i++)
72
		for(int i = 0; i < 5; i++)
73
		{
73
		{

Updated trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/QuestService.java Download diff

15071508
224
			if(template.getMaxRepeatCount() >= qs.getCompliteCount())
224
			if(template.getMaxRepeatCount() >= qs.getCompliteCount())
225
			{
225
			{
226
				qs.setStatus(questStatus);
226
				qs.setStatus(questStatus);
227
				qs.getQuestVars().setQuestVar(0);
227
				qs.setQuestVar(0);
228
			}
228
			}
229
		}
229
		}
230
230
...
...
240
		if(qs == null || qs.getStatus() != QuestStatus.START)
240
		if(qs == null || qs.getStatus() != QuestStatus.START)
241
			return false;
241
			return false;
242
242
243
		qs.getQuestVars().setQuestVarById(0, qs.getQuestVars().getQuestVarById(0) + 1);
243
		qs.setQuestVarById(0, qs.getQuestVarById(0) + 1);
244
		qs.setStatus(QuestStatus.REWARD);
244
		qs.setStatus(QuestStatus.REWARD);
245
		PacketSendUtility.sendPacket(player, new SM_QUEST_STEP(id, qs.getStatus(), qs.getQuestVars().getQuestVars()));
245
		PacketSendUtility.sendPacket(player, new SM_QUEST_STEP(id, qs.getStatus(), qs.getQuestVars().getQuestVars()));
246
		player.getController().updateNearbyQuests();
246
		player.getController().updateNearbyQuests();