diff --git a/scripts/npc/2082014.js b/scripts/npc/2082014.js index c7726f98e5..704ff90e81 100644 --- a/scripts/npc/2082014.js +++ b/scripts/npc/2082014.js @@ -40,10 +40,7 @@ function action(mode, type, selection) { } if (status == 0) { - const YamlConfig = Java.type('config.YamlConfig'); - if (YamlConfig.config.server.USE_ENABLE_CUSTOM_NPC_SCRIPT) { - cm.openShopNPC(2082014); - } else if (cm.isQuestStarted(3749)) { + if (cm.isQuestStarted(3749)) { cm.sendOk("We've already located the enemy's ultimate weapon! Follow along the ship's bow area ahead and you will find my sister #b#p2082013##k. Report to her for futher instructions on the mission."); } else { cm.sendDefault(); diff --git a/scripts/npc/9201101.js b/scripts/npc/9201101.js index d792fc5bd2..32eee0a223 100644 --- a/scripts/npc/9201101.js +++ b/scripts/npc/9201101.js @@ -4,13 +4,6 @@ */ function start() { - const YamlConfig = Java.type('config.YamlConfig'); - if (YamlConfig.config.server.USE_ENABLE_CUSTOM_NPC_SCRIPT) { - cm.openShopNPC(9201101); - } else { - //cm.sendOk("The patrol in New Leaf City is always ready. No creatures are able to break through to the city."); - cm.sendDefault(); - } - + cm.sendDefault(); cm.dispose(); } diff --git a/src/main/resources/db/migration/postgresql/V0.6__shop.sql b/src/main/resources/db/migration/postgresql/V0.6__shop.sql index 6e3d529a53..b2173325e6 100644 --- a/src/main/resources/db/migration/postgresql/V0.6__shop.sql +++ b/src/main/resources/db/migration/postgresql/V0.6__shop.sql @@ -85,7 +85,6 @@ VALUES (57, 2002001), (2080002, 2080002), (2080003, 2080003), (2080004, 2080004), - (2082014, 2082014), (2090001, 2090001), (2090002, 2090002), (2090003, 2090003), @@ -114,7 +113,6 @@ VALUES (57, 2002001), (9201059, 9201059), (9201060, 9201060), (9201099, 9201099), - (9201101, 9201101), (9270019, 9270019), (9270020, 9270020), (9270021, 9270021), @@ -2586,97 +2584,6 @@ VALUES (57, 3990000, 500, NULL, 1), (2080004, 4160036, 1000, NULL, 120), (2080004, 4160037, 1000, NULL, 112), (2080004, 4160039, 1000, NULL, 108), - (2082014, 2030007, 1800000, NULL, 90), - (2082014, 2040004, 480000, NULL, 1), - (2082014, 2040005, 242000, NULL, 36), - (2082014, 2040016, 253000, NULL, 39), - (2082014, 2040017, 500000, NULL, 4), - (2082014, 2040025, 500000, NULL, 2), - (2082014, 2040026, 253000, NULL, 37), - (2082014, 2040029, 500000, NULL, 3), - (2082014, 2040031, 253000, NULL, 38), - (2082014, 2040100, 700000, NULL, 81), - (2082014, 2040101, 540000, NULL, 80), - (2082014, 2040105, 700000, NULL, 83), - (2082014, 2040106, 540000, NULL, 82), - (2082014, 2040200, 700000, NULL, 85), - (2082014, 2040201, 540000, NULL, 84), - (2082014, 2040205, 700000, NULL, 87), - (2082014, 2040206, 540000, NULL, 86), - (2082014, 2040301, 400000, NULL, 5), - (2082014, 2040302, 275000, NULL, 40), - (2082014, 2040317, 400000, NULL, 6), - (2082014, 2040318, 275000, NULL, 41), - (2082014, 2040321, 400000, NULL, 7), - (2082014, 2040323, 275000, NULL, 42), - (2082014, 2040412, 220000, NULL, 43), - (2082014, 2040413, 400000, NULL, 8), - (2082014, 2040418, 400000, NULL, 9), - (2082014, 2040419, 220000, NULL, 44), - (2082014, 2040501, 250000, NULL, 10), - (2082014, 2040502, 275000, NULL, 45), - (2082014, 2040513, 250000, NULL, 11), - (2082014, 2040514, 275000, NULL, 46), - (2082014, 2040516, 250000, NULL, 12), - (2082014, 2040517, 275000, NULL, 47), - (2082014, 2040532, 250000, NULL, 13), - (2082014, 2040534, 275000, NULL, 48), - (2082014, 2040612, 220000, NULL, 49), - (2082014, 2040613, 400000, NULL, 14), - (2082014, 2040701, 450000, NULL, 15), - (2082014, 2040702, 220000, NULL, 50), - (2082014, 2040704, 450000, NULL, 16), - (2082014, 2040705, 275000, NULL, 51), - (2082014, 2040707, 450000, NULL, 17), - (2082014, 2040708, 220000, NULL, 52), - (2082014, 2040727, 550000, NULL, 33), - (2082014, 2040804, 550000, NULL, 18), - (2082014, 2040805, 1100000, NULL, 53), - (2082014, 2040807, 11000000, NULL, 35), - (2082014, 2040816, 1100000, NULL, 54), - (2082014, 2040817, 550000, NULL, 19), - (2082014, 2040914, 480000, NULL, 20), - (2082014, 2040915, 605000, NULL, 55), - (2082014, 2040919, 480000, NULL, 21), - (2082014, 2040920, 605000, NULL, 56), - (2082014, 2041007, 470000, NULL, 22), - (2082014, 2041008, 418000, NULL, 57), - (2082014, 2041010, 470000, NULL, 23), - (2082014, 2041011, 418000, NULL, 58), - (2082014, 2041013, 500000, NULL, 24), - (2082014, 2041014, 440000, NULL, 59), - (2082014, 2041016, 500000, NULL, 25), - (2082014, 2041017, 440000, NULL, 60), - (2082014, 2041019, 500000, NULL, 26), - (2082014, 2041020, 440000, NULL, 61), - (2082014, 2041022, 500000, NULL, 27), - (2082014, 2041023, 440000, NULL, 62), - (2082014, 2041058, 550000, NULL, 34), - (2082014, 2043001, 520000, NULL, 30), - (2082014, 2043002, 550000, NULL, 65), - (2082014, 2043801, 520000, NULL, 31), - (2082014, 2043802, 550000, NULL, 66), - (2082014, 2044601, 520000, NULL, 32), - (2082014, 2044602, 550000, NULL, 67), - (2082014, 2044701, 520000, NULL, 29), - (2082014, 2044702, 550000, NULL, 64), - (2082014, 2044901, 520000, NULL, 28), - (2082014, 2044902, 550000, NULL, 63), - (2082014, 2049200, 1870000, NULL, 68), - (2082014, 2049201, 2420000, NULL, 69), - (2082014, 2049202, 1870000, NULL, 70), - (2082014, 2049203, 2420000, NULL, 71), - (2082014, 2049204, 1870000, NULL, 72), - (2082014, 2049205, 2420000, NULL, 73), - (2082014, 2049206, 1870000, NULL, 74), - (2082014, 2049207, 2420000, NULL, 75), - (2082014, 2049208, 1540000, NULL, 76), - (2082014, 2049209, 1870000, NULL, 77), - (2082014, 2049210, 1540000, NULL, 78), - (2082014, 2049211, 1870000, NULL, 79), - (2082014, 2070016, 120000000, NULL, 88), - (2082014, 2070018, 190000000, NULL, 89), - (2082014, 4001017, 60000000, NULL, 91), (2090001, 1302004, 100000, NULL, 280), (2090001, 1302008, 40000, NULL, 284), (2090001, 1302009, 225000, NULL, 276), @@ -3369,24 +3276,6 @@ VALUES (57, 3990000, 500, NULL, 1), (9201099, 2060004, 40, NULL, 7), (9201099, 2061004, 40, NULL, 6), (9201099, 2070010, 2000, NULL, 5), - (9201101, 2002028, 5000000, NULL, 132), - (9201101, 2012008, 4200000, NULL, 164), - (9201101, 2020027, 2100000, NULL, 144), - (9201101, 2022113, 1800000, NULL, 148), - (9201101, 2022121, 12000000, NULL, 152), - (9201101, 2022123, 12000000, NULL, 156), - (9201101, 2022251, 3800000, NULL, 168), - (9201101, 2022277, 5300000, NULL, 160), - (9201101, 2022338, 2100000, NULL, 100), - (9201101, 2022339, 2800000, NULL, 104), - (9201101, 2022340, 4000000, NULL, 108), - (9201101, 2022341, 2800000, NULL, 112), - (9201101, 2022342, 2000000, NULL, 116), - (9201101, 2022343, 4700000, NULL, 120), - (9201101, 2022344, 5000000, NULL, 124), - (9201101, 2022345, 4000000, NULL, 128), - (9201101, 2022544, 100000, NULL, 136), - (9201101, 2022545, 4400000, NULL, 140), (9270019, 1302004, 100000, NULL, 264), (9270019, 1302008, 40000, NULL, 268), (9270019, 1302009, 225000, NULL, 260),