Goldberg's Room fixes.

Contributed by AnsS.
This commit is contained in:
MobiusDevelopment 2021-01-21 23:57:20 +00:00
parent b244e82e75
commit ad2dc01771
8 changed files with 262 additions and 0 deletions

View File

@ -120,6 +120,11 @@ public class GolbergRoom extends AbstractInstance
return null;
}
if (world.getParameters().getInt("treasureCounter", 0) == 0)
{
world.getParameters().set("treasureCounter", 0);
}
if (player.isGM())
{
if (world.getParameters().getInt("treasureCounter", 0) <= 27)

View File

@ -137,6 +137,10 @@
<set name="is_sellable" val="false" />
<set name="is_stackable" val="true" />
<set name="material" val="PAPER" />
<set name="handler" val="ItemSkills" />
<skills>
<skill id="51075" level="1" /> <!-- Weapon Pack (Best A-grade) -->
</skills>
</item>
<item id="91013" name="Weapon Ingredient/Recipe Box (Top A-grade)" type="EtcItem">
<!-- Double-click to obtain a top A-grade weapon ingredient or recipe. Cannot be dropped. -->

View File

@ -1070,6 +1070,74 @@
<skillList>
<skill id="4416" level="2" /> <!-- Magical Creatures -->
</skillList>
<dropLists>
<drop>
<item id="57" min="200000" max="500000" chance="5"/> <!-- Adena -->
<item id="1462" min="1" max="2" chance="2"/> <!-- Crystal (S-grade) -->
<item id="1808" min="1" max="1" chance="2"/> <!-- Recipe: Soulshot (S-grade) (100%) -->
<item id="3957" min="1" max="1" chance="2"/> <!-- Recipe: Blessed Spiritshot (S-grade) (100%) -->
<item id="1888" min="1" max="1" chance="2"/> <!-- Synthetic Cokes -->
<item id="1894" min="1" max="1" chance="2"/> <!-- Crafted Leather -->
<item id="5553" min="1" max="1" chance="2"/> <!-- Arcsmith' Anvil -->
<item id="5550" min="1" max="1" chance="2"/> <!-- Reinforced Metal Plate -->
<item id="1889" min="1" max="1" chance="2"/> <!-- Synthetic Braid -->
<item id="6688" min="1" max="1" chance="0.5"/> <!-- Forgotten Blade Edge -->
<item id="6689" min="1" max="1" chance="0.5"/> <!-- Basalt Battlehammer Head -->
<item id="6690" min="1" max="1" chance="0.5"/> <!-- Imperial Staff Head -->
<item id="6691" min="1" max="1" chance="0.5"/> <!-- Angel Slayer Blade -->
<item id="6693" min="1" max="1" chance="0.5"/> <!-- Dragon Hunter Axe Blade -->
<item id="6694" min="1" max="1" chance="0.5"/> <!-- Saint Spear Blade -->
<item id="6695" min="1" max="1" chance="0.5"/> <!-- Demon Splinter Blade -->
<item id="6696" min="1" max="1" chance="0.5"/> <!-- Heaven's Divider Edge -->
<item id="6697" min="1" max="1" chance="0.5"/> <!-- Arcana Mace Head -->
<item id="6698" min="1" max="1" chance="0.5"/> <!-- Sealed Tateossian Earring Part -->
<item id="6699" min="1" max="1" chance="0.5"/> <!-- Sealed Tateossian Ring Gem -->
<item id="6847" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Tateossian Earring (30%) -->
<item id="6849" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Tateossian Ring (30%) -->
<item id="6851" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Tateossian Necklace (30%) -->
<item id="6853" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Breastplate (30%) -->
<item id="6855" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Gaiters (30%) -->
<item id="6857" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Gauntlets (30%) -->
<item id="6859" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Boots (30%) -->
<item id="6861" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Shield (30%) -->
<item id="6863" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Helmet (30%) -->
<item id="6865" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Armor (30%) -->
<item id="6867" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Gloves (30%) -->
<item id="6869" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Boots (30%) -->
<item id="6871" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Helmet (30%) -->
<item id="6873" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Robe (30%) -->
<item id="6875" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Gloves (30%) -->
<item id="6877" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Boots (30%) -->
<item id="6879" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Circlet (30%) -->
<item id="6881" min="1" max="1" chance="0.5"/> <!-- Recipe: Forgotten Blade (30%) -->
<item id="6883" min="1" max="1" chance="0.5"/> <!-- Recipe: Basalt Battlehammer (30%) -->
<item id="6885" min="1" max="1" chance="0.5"/> <!-- Recipe: Imperial Staff (30%) -->
<item id="6887" min="1" max="1" chance="0.5"/> <!-- Recipe: Angel Slayer (30%) -->
<item id="6891" min="1" max="1" chance="0.5"/> <!-- Recipe: Dragon Hunter Axe (30%) -->
<item id="6893" min="1" max="1" chance="0.5"/> <!-- Recipe: Saint Spear (30%) -->
<item id="6895" min="1" max="1" chance="0.5"/> <!-- Recipe: Demon Splinter (30%) -->
<item id="6897" min="1" max="1" chance="0.5"/> <!-- Recipe: Heaven's Divider (30%) -->
<item id="6899" min="1" max="1" chance="0.5"/> <!-- Recipe: Arcana Mace (30%) -->
<item id="2134" min="1" max="1" chance="0.5"/> <!-- Gemstone (S-grade) -->
<item id="6700" min="1" max="1" chance="0.5"/> <!-- Sealed Tateossian Necklace Chain -->
<item id="6701" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Breastplate Part -->
<item id="6702" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Gaiter Pattern -->
<item id="6703" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Gauntlets Design -->
<item id="6704" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Boots Design -->
<item id="6705" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Shield Fragment -->
<item id="6706" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Helmet Pattern -->
<item id="6707" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Armor Part -->
<item id="6708" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Glove Fabric -->
<item id="6709" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Boots Design -->
<item id="6710" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Helmet Pattern -->
<item id="6711" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Robe Part -->
<item id="6712" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Gloves fabric -->
<item id="6713" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Boots Design -->
<item id="6714" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Circlet Pattern -->
<item id="91012" min="1" max="1" chance="0.5"/> <!-- Weapon Supply Box (Best A-grade) -->
<item id="49786" min="1" max="1" chance="0.5"/> <!-- A-grade Armor Supply Box -->
</drop>
</dropLists>
</npc>
<npc id="18358" level="82" type="Monster" name="Goldberg's Steward">
<race>DEMONIC</race>

View File

@ -835,10 +835,64 @@
<reuseDelay>1000</reuseDelay>
</skill>
<skill id="51075" toLevel="1" name="Weapon Pack (Best A-grade)">
<icon>icon.etc_treasure_box_i07</icon>
<isMagic>2</isMagic> <!-- Static Skill -->
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>91012</itemConsumeId>
<magicLevel>1</magicLevel>
<operateType>A1</operateType>
<hitTime>500</hitTime>
<coolTime>500</coolTime>
<reuseDelay>1000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpEncumbered">
<weightPercent>20</weightPercent>
<slotsPercent>10</slotsPercent>
</condition>
</conditions>
<effects>
<effect name="RestorationRandom">
<items>
<item chance="9.09">
<item id="8678" count="1" /> <!-- Sirra's Blade -->
</item>
<item chance="9.09">
<item id="8679" count="1" /> <!-- Sword of Ipos -->
</item>
<item chance="9.09">
<item id="8680" count="1" /> <!-- Barakiel's Axe -->
</item>
<item chance="9.09">
<item id="8681" count="1" /> <!-- Behemoth' Tuning Fork -->
</item>
<item chance="9.09">
<item id="8682" count="1" /> <!-- Naga Storm -->
</item>
<item chance="9.09">
<item id="8683" count="1" /> <!-- Tiphon's Spear -->
</item>
<item chance="9.09">
<item id="8684" count="1" /> <!-- Shyeed's Bow -->
</item>
<item chance="9.09">
<item id="8685" count="1" /> <!-- Sobekk's Hurricane -->
</item>
<item chance="9.09">
<item id="8686" count="1" /> <!-- Themis' Tongue -->
</item>
<item chance="9.09">
<item id="8687" count="1" /> <!-- Cabrio's Hand -->
</item>
<item chance="9.09">
<item id="8688" count="1" /> <!-- Daimon Crystal -->
</item>
</items>
</effect>
</effects>
</skill>
<skill id="51076" toLevel="1" name="Weapon Ingredient/Recipe Box (Top A-grade)">
<operateType>A1</operateType>

View File

@ -120,6 +120,11 @@ public class GolbergRoom extends AbstractInstance
return null;
}
if (world.getParameters().getInt("treasureCounter", 0) == 0)
{
world.getParameters().set("treasureCounter", 0);
}
if (player.isGM())
{
if (world.getParameters().getInt("treasureCounter", 0) <= 27)

View File

@ -137,6 +137,10 @@
<set name="is_sellable" val="false" />
<set name="is_stackable" val="true" />
<set name="material" val="PAPER" />
<set name="handler" val="ItemSkills" />
<skills>
<skill id="51075" level="1" /> <!-- Weapon Pack (Best A-grade) -->
</skills>
</item>
<item id="91013" name="Weapon Ingredient/Recipe Box (Top A-grade)" type="EtcItem">
<!-- Double-click to obtain a top A-grade weapon ingredient or recipe. Cannot be dropped. -->

View File

@ -1070,6 +1070,74 @@
<skillList>
<skill id="4416" level="2" /> <!-- Magical Creatures -->
</skillList>
<dropLists>
<drop>
<item id="57" min="200000" max="500000" chance="5"/> <!-- Adena -->
<item id="1462" min="1" max="2" chance="2"/> <!-- Crystal (S-grade) -->
<item id="1808" min="1" max="1" chance="2"/> <!-- Recipe: Soulshot (S-grade) (100%) -->
<item id="3957" min="1" max="1" chance="2"/> <!-- Recipe: Blessed Spiritshot (S-grade) (100%) -->
<item id="1888" min="1" max="1" chance="2"/> <!-- Synthetic Cokes -->
<item id="1894" min="1" max="1" chance="2"/> <!-- Crafted Leather -->
<item id="5553" min="1" max="1" chance="2"/> <!-- Arcsmith' Anvil -->
<item id="5550" min="1" max="1" chance="2"/> <!-- Reinforced Metal Plate -->
<item id="1889" min="1" max="1" chance="2"/> <!-- Synthetic Braid -->
<item id="6688" min="1" max="1" chance="0.5"/> <!-- Forgotten Blade Edge -->
<item id="6689" min="1" max="1" chance="0.5"/> <!-- Basalt Battlehammer Head -->
<item id="6690" min="1" max="1" chance="0.5"/> <!-- Imperial Staff Head -->
<item id="6691" min="1" max="1" chance="0.5"/> <!-- Angel Slayer Blade -->
<item id="6693" min="1" max="1" chance="0.5"/> <!-- Dragon Hunter Axe Blade -->
<item id="6694" min="1" max="1" chance="0.5"/> <!-- Saint Spear Blade -->
<item id="6695" min="1" max="1" chance="0.5"/> <!-- Demon Splinter Blade -->
<item id="6696" min="1" max="1" chance="0.5"/> <!-- Heaven's Divider Edge -->
<item id="6697" min="1" max="1" chance="0.5"/> <!-- Arcana Mace Head -->
<item id="6698" min="1" max="1" chance="0.5"/> <!-- Sealed Tateossian Earring Part -->
<item id="6699" min="1" max="1" chance="0.5"/> <!-- Sealed Tateossian Ring Gem -->
<item id="6847" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Tateossian Earring (30%) -->
<item id="6849" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Tateossian Ring (30%) -->
<item id="6851" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Tateossian Necklace (30%) -->
<item id="6853" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Breastplate (30%) -->
<item id="6855" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Gaiters (30%) -->
<item id="6857" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Gauntlets (30%) -->
<item id="6859" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Boots (30%) -->
<item id="6861" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Shield (30%) -->
<item id="6863" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Imperial Crusader Helmet (30%) -->
<item id="6865" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Armor (30%) -->
<item id="6867" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Gloves (30%) -->
<item id="6869" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Boots (30%) -->
<item id="6871" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Draconic Leather Helmet (30%) -->
<item id="6873" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Robe (30%) -->
<item id="6875" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Gloves (30%) -->
<item id="6877" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Boots (30%) -->
<item id="6879" min="1" max="1" chance="0.5"/> <!-- Recipe: Sealed Major Arcana Circlet (30%) -->
<item id="6881" min="1" max="1" chance="0.5"/> <!-- Recipe: Forgotten Blade (30%) -->
<item id="6883" min="1" max="1" chance="0.5"/> <!-- Recipe: Basalt Battlehammer (30%) -->
<item id="6885" min="1" max="1" chance="0.5"/> <!-- Recipe: Imperial Staff (30%) -->
<item id="6887" min="1" max="1" chance="0.5"/> <!-- Recipe: Angel Slayer (30%) -->
<item id="6891" min="1" max="1" chance="0.5"/> <!-- Recipe: Dragon Hunter Axe (30%) -->
<item id="6893" min="1" max="1" chance="0.5"/> <!-- Recipe: Saint Spear (30%) -->
<item id="6895" min="1" max="1" chance="0.5"/> <!-- Recipe: Demon Splinter (30%) -->
<item id="6897" min="1" max="1" chance="0.5"/> <!-- Recipe: Heaven's Divider (30%) -->
<item id="6899" min="1" max="1" chance="0.5"/> <!-- Recipe: Arcana Mace (30%) -->
<item id="2134" min="1" max="1" chance="0.5"/> <!-- Gemstone (S-grade) -->
<item id="6700" min="1" max="1" chance="0.5"/> <!-- Sealed Tateossian Necklace Chain -->
<item id="6701" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Breastplate Part -->
<item id="6702" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Gaiter Pattern -->
<item id="6703" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Gauntlets Design -->
<item id="6704" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Boots Design -->
<item id="6705" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Shield Fragment -->
<item id="6706" min="1" max="1" chance="0.5"/> <!-- Sealed Imperial Crusader Helmet Pattern -->
<item id="6707" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Armor Part -->
<item id="6708" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Glove Fabric -->
<item id="6709" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Boots Design -->
<item id="6710" min="1" max="1" chance="0.5"/> <!-- Sealed Draconic Leather Helmet Pattern -->
<item id="6711" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Robe Part -->
<item id="6712" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Gloves fabric -->
<item id="6713" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Boots Design -->
<item id="6714" min="1" max="1" chance="0.5"/> <!-- Sealed Major Arcana Circlet Pattern -->
<item id="91012" min="1" max="1" chance="0.5"/> <!-- Weapon Supply Box (Best A-grade) -->
<item id="49786" min="1" max="1" chance="0.5"/> <!-- A-grade Armor Supply Box -->
</drop>
</dropLists>
</npc>
<npc id="18358" level="82" type="Monster" name="Goldberg's Steward">
<race>DEMONIC</race>

View File

@ -835,10 +835,64 @@
<reuseDelay>1000</reuseDelay>
</skill>
<skill id="51075" toLevel="1" name="Top-grade A-grade Weapon Pack">
<icon>icon.etc_treasure_box_i07</icon>
<isMagic>2</isMagic> <!-- Static Skill -->
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>91012</itemConsumeId>
<magicLevel>1</magicLevel>
<operateType>A1</operateType>
<hitTime>500</hitTime>
<coolTime>500</coolTime>
<reuseDelay>1000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpEncumbered">
<weightPercent>20</weightPercent>
<slotsPercent>10</slotsPercent>
</condition>
</conditions>
<effects>
<effect name="RestorationRandom">
<items>
<item chance="9.09">
<item id="8678" count="1" /> <!-- Sirra's Blade -->
</item>
<item chance="9.09">
<item id="8679" count="1" /> <!-- Sword of Ipos -->
</item>
<item chance="9.09">
<item id="8680" count="1" /> <!-- Barakiel's Axe -->
</item>
<item chance="9.09">
<item id="8681" count="1" /> <!-- Behemoth' Tuning Fork -->
</item>
<item chance="9.09">
<item id="8682" count="1" /> <!-- Naga Storm -->
</item>
<item chance="9.09">
<item id="8683" count="1" /> <!-- Tiphon's Spear -->
</item>
<item chance="9.09">
<item id="8684" count="1" /> <!-- Shyeed's Bow -->
</item>
<item chance="9.09">
<item id="8685" count="1" /> <!-- Sobekk's Hurricane -->
</item>
<item chance="9.09">
<item id="8686" count="1" /> <!-- Themis' Tongue -->
</item>
<item chance="9.09">
<item id="8687" count="1" /> <!-- Cabrio's Hand -->
</item>
<item chance="9.09">
<item id="8688" count="1" /> <!-- Daimon Crystal -->
</item>
</items>
</effect>
</effects>
</skill>
<skill id="51076" toLevel="1" name="Top A-grade Weapon Ingredient/ Recipe Pack">
<operateType>A1</operateType>