Skip to content

Commit

Permalink
Birthday event 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
@Estrayl
Estrayl committed Nov 14, 2024
1 parent 22b0e46 commit 39e1fcf
Show file tree
Hide file tree
Showing 8 changed files with 1,086 additions and 656 deletions.
23 changes: 1 addition & 22 deletions game-server/data/handlers/ai/worlds/panesterra/PanesterraEntryCorridorAI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import java.util.stream.Stream;

import com.aionemu.commons.utils.Rnd;
import com.aionemu.gameserver.ai.AIName;
import com.aionemu.gameserver.model.gameobjects.Npc;
import com.aionemu.gameserver.model.gameobjects.player.Player;
Expand All @@ -14,9 +13,7 @@
import com.aionemu.gameserver.services.event.EventService;
import com.aionemu.gameserver.services.panesterra.PanesterraService;
import com.aionemu.gameserver.services.panesterra.ahserion.PanesterraFaction;
import com.aionemu.gameserver.services.teleport.TeleportService;
import com.aionemu.gameserver.utils.PacketSendUtility;
import com.aionemu.gameserver.world.WorldPosition;

import ai.GeneralNpcAI;

Expand Down Expand Up @@ -48,7 +45,7 @@ protected void handleSpawned() {
public boolean onDialogSelect(Player player, int dialogActionId, int questId, int extendedRewardIndex) {
if (dialogActionId == SETPRO1 && canTeleport(player)) {
// teleportToFortress(player);
teleportToEventLocation(player);
PanesterraService.getInstance().teleportToEventLocation(player);
}
return true;
}
Expand Down Expand Up @@ -80,22 +77,4 @@ private void teleportToFortress(Player player) {
// TODO
player.setPanesterraFaction(PanesterraFaction.getByFortressId(relatedFortressId));
}

private void teleportToEventLocation(Player player) {
switch (player.getRace()) {
case ELYOS -> {
// North + South
WorldPosition pos = Rnd.nextBoolean() ? new WorldPosition(400020000, 11.173f, 1024.187f, 1428.60f, (byte) 0)
: new WorldPosition(400020000, 2037.754f, 1023.808f, 1428.60f, (byte) 0);
TeleportService.teleportTo(player, pos);
}
case ASMODIANS -> {
// West + East
WorldPosition pos = Rnd.nextBoolean() ? new WorldPosition(400020000, 1023.702f, 10.531f, 1428.60f, (byte) 90)
: new WorldPosition(400020000, 1024.310f, 2036.593f, 1428.60f, (byte) 90);
TeleportService.teleportTo(player, pos);
}
}
PanesterraService.getInstance().onEnterPanesterra(player);
}
}
92 changes: 1 addition & 91 deletions game-server/data/static_data/bounties/kill_bounties.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,96 +91,6 @@
<bounty item_id="186000242" count="2" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="200">
<bounty item_id="166500002" count="5" /><!-- Amplification Stone -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="210">
<bounty item_id="186000051" count="3" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="220">
<bounty item_id="188053610" count="2" /><!-- [Event] Level 70 Composite Manastone Bundle -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="230">
<bounty item_id="186000242" count="2" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="240">
<bounty item_id="188052936" count="1" /><!-- Shugo Icebox -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="250">
<bounty item_id="186000051" count="3" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="260">
<bounty item_id="188053610" count="2" /><!-- [Event] Level 70 Composite Manastone Bundle -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="270">
<bounty item_id="186000242" count="2" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="280">
<bounty item_id="168310018" count="1" /><!-- Major Blessed Augment: Level 2 -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="290">
<bounty item_id="186000051" count="3" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="300">
<bounty item_id="188053610" count="2" /><!-- [Event] Level 70 Composite Manastone Bundle -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="310">
<bounty item_id="186000242" count="2" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="320">
<bounty item_id="166030005" count="5" /><!-- Tempering Solution -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="330">
<bounty item_id="186000051" count="3" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="340">
<bounty item_id="188053610" count="2" /><!-- [Event] Level 70 Composite Manastone Bundle -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="350">
<bounty item_id="186000242" count="2" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="360">
<bounty item_id="188053646" count="1" /><!-- Nether Dragon King's Sealed Box -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="370">
<bounty item_id="186000051" count="3" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="380">
<bounty item_id="188053610" count="2" /><!-- [Event] Level 70 Composite Manastone Bundle -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="390">
<bounty item_id="186000242" count="2" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="400">
<bounty item_id="168310018" count="1" /><!-- Major Blessed Augment: Level 2 -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="410">
<bounty item_id="186000051" count="5" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="420">
<bounty item_id="188053610" count="3" /><!-- [Event] Level 70 Composite Manastone Bundle -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="430">
<bounty item_id="186000242" count="3" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="440">
<bounty item_id="166500002" count="10" /><!-- Amplification Stone -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="450">
<bounty item_id="186000051" count="5" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="460">
<bounty item_id="188053610" count="3" /><!-- [Event] Level 70 Composite Manastone Bundle -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="470">
<bounty item_id="186000242" count="3" /><!-- Ceramium Medal -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="480">
<bounty item_id="165020020" count="1" /><!-- Noble Weapon Wrapping Scroll (Mythic/Lv. 65 and lower) -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="490">
<bounty item_id="186000051" count="5" /><!-- Major Ancient Crown -->
</kill_bounty>
<kill_bounty type="SEASONAL_KILLS" kill_count="500">
<bounty item_id="166030005" count="10" /><!-- Tempering Solution -->
<bounty item_id="188053109" count="1" /><!-- Ahserion's Equipment Chest -->
</kill_bounty>
</kill_bounties>
3 changes: 3 additions & 0 deletions game-server/data/static_data/chests/chest_templates.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,9 @@
</chest>
<!-- Event -->
<!-- Birthday Cake -->
<chest npc_id="701952">
<key_item item_ids="0" count="1" />
</chest>
<chest npc_id="701983">
<key_item item_ids="0" count="1" />
</chest>
Expand Down
59 changes: 51 additions & 8 deletions game-server/data/static_data/custom_drop/custom_drop.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5457,7 +5457,7 @@
</drop_group>
</npc_drop>
<!-- Birthday Event -->
<npc_drop npc_id="701983">
<npc_drop npc_id="701952">
<drop_group><!-- GUARANTEED -->
<drop item_id="162002030" min_amount="20" /><!-- [Event] Premium Restoration Serum -->
<drop item_id="166000195" min_amount="3" /><!-- Epsilon Enchantment Stone -->
Expand All @@ -5468,34 +5468,77 @@
<drop item_id="188053628" min_amount="3" /><!-- Pallasite Bundle -->
</drop_group>
<drop_group><!-- COMMON -->
<drop item_id="166500002" chance="25" min_amount="2" /><!-- Amplification Stone -->
<drop item_id="166020000" chance="25" min_amount="2" /><!-- Omega Enchantment Stone -->
<drop item_id="166030005" chance="25" min_amount="2" /><!-- Tempering Solution -->
<drop item_id="162000137" chance="25" min_amount="3" /><!-- [Event] Spicy Banquet Victory Food -->
<drop item_id="160005052" chance="25" min_amount="3" /><!-- [Event] Spicy Banquet Victory Food -->
<drop item_id="160005053" chance="25" min_amount="3" /><!-- [Event] Sweet Banquet Victory Food -->
<drop item_id="186000243" chance="25" min_amount="5" /><!-- Fragmented Ceranium -->
</drop_group>
<drop_group><!-- UNCOMMON -->
<drop item_id="166500002" chance="10" min_amount="2" /><!-- Amplification Stone -->
<drop item_id="188053610" chance="10" min_amount="3" /><!-- [Event] Level 70 Composite Manastone Bundle -->
<drop item_id="188053614" chance="10" /><!-- Illusion Godstone Bundle -->
<drop item_id="188053845" chance="10" /><!-- Summer-Loving Penguin Transformation Candy Box -->
<drop item_id="188053702" chance="10" /><!-- Vasharti's Equipment Box -->
<drop item_id="164002224" chance="10" /><!-- Administrator's Boon IV - 15-Day Pass -->
</drop_group>
<drop_group><!-- RARE -->
<drop item_id="188053295" chance="5" /><!-- Empyrean Plume Chest -->
<drop item_id="188053614" chance="5" /><!-- Illusion Godstone Bundle -->
<drop item_id="188053700" chance="5" /><!-- Honorable Accessory Box of Conquest-->
<drop item_id="186000402" chance="5" /><!-- Glittering Shell -->
<drop item_id="188053618" chance="5" /><!-- Honorable Elim's Idian Bundle -->
<drop item_id="188950015" chance="5" /><!-- Special Courier Pass (Eternal/Lv. 61-65) -->
<drop item_id="168310018" chance="5" /><!-- Greater Blessed Augmentation: Level 2 -->
</drop_group>
<drop_group><!-- SUPER RARE -->
<drop item_id="188053611" chance="0.5" /><!-- [Event] Wing Box -->
<drop item_id="188051709" chance="0.5" /><!-- [Event] Silver Box -->
<drop item_id="190070017" chance="0.5" /><!-- Sidekick Akumu Summoning Lamp -->
<drop item_id="188053007" chance="0.5" /><!-- [Event] Hyperion's Mythic Weapon Chest -->
<drop item_id="188053006" chance="0.5" /><!-- [Event] Hyperion's Mythic Armor Chest -->
<drop item_id="188053728" chance="0.5" /><!-- Beritra's Equipment Box -->
<drop item_id="188052936" chance="0.5" /><!-- Shugo Icebox -->
<drop item_id="187000157" chance="0.5" /><!-- Beritra's Phantom Wings -->
<drop item_id="190100164" chance="0.5" /><!-- Magnificent Clucklich -->
<drop item_id="188950019" chance="0.5" /><!-- Special Courier Pass (Mythic/Lv. 61-65) -->
</drop_group>
</npc_drop>
<npc_drop npc_id="701983">
<drop_group><!-- GUARANTEED -->
<drop item_id="162002030" min_amount="20" /><!-- [Event] Premium Restoration Serum -->
<drop item_id="166000195" min_amount="3" /><!-- Epsilon Enchantment Stone -->
<drop item_id="186000237" min_amount="50" /><!-- Ancient Coin -->
<drop item_id="188052722" /><!-- [Event] Daeva's Day Kisk Present -->
<drop item_id="188051784" /><!-- Birthday Cake Bundle -->
<drop item_id="169000011" min_amount="100" /><!-- Power Shard: +50 -->
<drop item_id="188053628" min_amount="3" /><!-- Pallasite Bundle -->
</drop_group>
<drop_group><!-- COMMON -->
<drop item_id="166020000" chance="50" min_amount="2" /><!-- Omega Enchantment Stone -->
<drop item_id="166030005" chance="50" min_amount="2" /><!-- Tempering Solution -->
<drop item_id="160005052" chance="50" min_amount="3" /><!-- [Event] Spicy Banquet Victory Food -->
<drop item_id="160005053" chance="50" min_amount="3" /><!-- [Event] Sweet Banquet Victory Food -->
<drop item_id="186000243" chance="50" min_amount="5" /><!-- Fragmented Ceranium -->
</drop_group>
<drop_group><!-- UNCOMMON -->
<drop item_id="166500002" chance="20" min_amount="2" /><!-- Amplification Stone -->
<drop item_id="188053610" chance="20" min_amount="3" /><!-- [Event] Level 70 Composite Manastone Bundle -->
<drop item_id="188053845" chance="20" /><!-- Summer-Loving Penguin Transformation Candy Box -->
<drop item_id="188053702" chance="20" /><!-- Vasharti's Equipment Box -->
<drop item_id="164002224" chance="20" /><!-- Administrator's Boon IV - 15-Day Pass -->
</drop_group>
<drop_group><!-- RARE -->
<drop item_id="188053295" chance="10" /><!-- Empyrean Plume Chest -->
<drop item_id="188053614" chance="10" /><!-- Illusion Godstone Bundle -->
<drop item_id="188053700" chance="10" /><!-- Honorable Accessory Box of Conquest-->
<drop item_id="188053618" chance="10" /><!-- Honorable Elim's Idian Bundle -->
<drop item_id="188950015" chance="10" /><!-- Special Courier Pass (Eternal/Lv. 61-65) -->
<drop item_id="168310018" chance="10" /><!-- Greater Blessed Augmentation: Level 2 -->
</drop_group>
<drop_group><!-- SUPER RARE -->
<drop item_id="188053007" chance="1" /><!-- [Event] Hyperion's Mythic Weapon Chest -->
<drop item_id="188053006" chance="1" /><!-- [Event] Hyperion's Mythic Armor Chest -->
<drop item_id="188053728" chance="1" /><!-- Beritra's Equipment Box -->
<drop item_id="188052936" chance="1" /><!-- Shugo Icebox -->
<drop item_id="187000157" chance="1" /><!-- Beritra's Phantom Wings -->
<drop item_id="190100164" chance="1" /><!-- Magnificent Clucklich -->
<drop item_id="188950019" chance="1" /><!-- Special Courier Pass (Mythic/Lv. 61-65) -->
</drop_group>
</npc_drop>
</custom_drop>
Loading

0 comments on commit 39e1fcf

Please sign in to comment.