Multi World NPCs + patch on Player interactions

Made NPCs now work properly on multiworld system. Solved multiple issues regarding Player Shops not giving back items properly when owner exits. Added restriction on changing channels at FM rooms, preventing shop owner entering Cash Shop.
2017-05-28 22:11:39 -03:00
parent d0396e4c36
commit 7f178a3d80
548 changed files with 340 additions and 164 deletions
--- a/scripts/npc/world0/1002000.js
+++ b/scripts/npc/world0/1002000.js
--- a/scripts/npc/world0/1002002.js
+++ b/scripts/npc/world0/1002002.js
--- a/scripts/npc/world0/1002003.js
+++ b/scripts/npc/world0/1002003.js
--- a/scripts/npc/world0/1002004.js
+++ b/scripts/npc/world0/1002004.js
--- a/scripts/npc/world0/1002005.js
+++ b/scripts/npc/world0/1002005.js
--- a/scripts/npc/world0/1002007.js
+++ b/scripts/npc/world0/1002007.js
--- a/scripts/npc/world0/1002100.js
+++ b/scripts/npc/world0/1002100.js
--- a/scripts/npc/world0/1012000.js
+++ b/scripts/npc/world0/1012000.js
--- a/scripts/npc/world0/1012002.js
+++ b/scripts/npc/world0/1012002.js
--- a/scripts/npc/world0/1012005.js
+++ b/scripts/npc/world0/1012005.js
--- a/scripts/npc/world0/1012006.js
+++ b/scripts/npc/world0/1012006.js
--- a/scripts/npc/world0/1012007.js
+++ b/scripts/npc/world0/1012007.js
--- a/scripts/npc/world0/1012008.js
+++ b/scripts/npc/world0/1012008.js
--- a/scripts/npc/world0/1012009.js
+++ b/scripts/npc/world0/1012009.js
--- a/scripts/npc/world0/1012100.js
+++ b/scripts/npc/world0/1012100.js
--- a/scripts/npc/world0/1012103.js
+++ b/scripts/npc/world0/1012103.js
--- a/scripts/npc/world0/1012104.js
+++ b/scripts/npc/world0/1012104.js
--- a/scripts/npc/world0/1012105.js
+++ b/scripts/npc/world0/1012105.js
--- a/scripts/npc/world0/1012112.js
+++ b/scripts/npc/world0/1012112.js
--- a/scripts/npc/world0/1012113.js
+++ b/scripts/npc/world0/1012113.js
--- a/scripts/npc/world0/1012114.js
+++ b/scripts/npc/world0/1012114.js
--- a/scripts/npc/world0/1012118.js
+++ b/scripts/npc/world0/1012118.js
--- a/scripts/npc/world0/1012119.js
+++ b/scripts/npc/world0/1012119.js
--- a/scripts/npc/world0/1013001.js
+++ b/scripts/npc/world0/1013001.js
--- a/scripts/npc/world0/1013002.js
+++ b/scripts/npc/world0/1013002.js
--- a/scripts/npc/world0/1013104.js
+++ b/scripts/npc/world0/1013104.js
--- a/scripts/npc/world0/1013200.js
+++ b/scripts/npc/world0/1013200.js
--- a/scripts/npc/world0/10200.js
+++ b/scripts/npc/world0/10200.js
--- a/scripts/npc/world0/10201.js
+++ b/scripts/npc/world0/10201.js
--- a/scripts/npc/world0/10202.js
+++ b/scripts/npc/world0/10202.js
--- a/scripts/npc/world0/10203.js
+++ b/scripts/npc/world0/10203.js
--- a/scripts/npc/world0/10204.js
+++ b/scripts/npc/world0/10204.js
--- a/scripts/npc/world0/1022000.js
+++ b/scripts/npc/world0/1022000.js
--- a/scripts/npc/world0/1022001.js
+++ b/scripts/npc/world0/1022001.js
--- a/scripts/npc/world0/1022003.js
+++ b/scripts/npc/world0/1022003.js
--- a/scripts/npc/world0/1022004.js
+++ b/scripts/npc/world0/1022004.js
--- a/scripts/npc/world0/1022005.js
+++ b/scripts/npc/world0/1022005.js
--- a/scripts/npc/world0/1022101.js
+++ b/scripts/npc/world0/1022101.js
--- a/scripts/npc/world0/1022101_old.js
+++ b/scripts/npc/world0/1022101_old.js
--- a/scripts/npc/world0/1022105.js
+++ b/scripts/npc/world0/1022105.js
--- a/scripts/npc/world0/1032000.js
+++ b/scripts/npc/world0/1032000.js
--- a/scripts/npc/world0/1032001.js
+++ b/scripts/npc/world0/1032001.js
--- a/scripts/npc/world0/1032002.js
+++ b/scripts/npc/world0/1032002.js
--- a/scripts/npc/world0/1032003.js
+++ b/scripts/npc/world0/1032003.js
--- a/scripts/npc/world0/1032004.js
+++ b/scripts/npc/world0/1032004.js
--- a/scripts/npc/world0/1032005.js
+++ b/scripts/npc/world0/1032005.js
--- a/scripts/npc/world0/1032006.js
+++ b/scripts/npc/world0/1032006.js
--- a/scripts/npc/world0/1032007.js
+++ b/scripts/npc/world0/1032007.js
--- a/scripts/npc/world0/1032008.js
+++ b/scripts/npc/world0/1032008.js
--- a/scripts/npc/world0/1032009.js
+++ b/scripts/npc/world0/1032009.js
--- a/scripts/npc/world0/1032100.js
+++ b/scripts/npc/world0/1032100.js
--- a/scripts/npc/world0/1032102.js
+++ b/scripts/npc/world0/1032102.js
--- a/scripts/npc/world0/1032114.js
+++ b/scripts/npc/world0/1032114.js
--- a/scripts/npc/world0/1043000.js
+++ b/scripts/npc/world0/1043000.js
--- a/scripts/npc/world0/1043001.js
+++ b/scripts/npc/world0/1043001.js
--- a/scripts/npc/world0/1052001.js
+++ b/scripts/npc/world0/1052001.js
--- a/scripts/npc/world0/1052002.js
+++ b/scripts/npc/world0/1052002.js
--- a/scripts/npc/world0/1052003.js
+++ b/scripts/npc/world0/1052003.js
--- a/scripts/npc/world0/1052004.js
+++ b/scripts/npc/world0/1052004.js
--- a/scripts/npc/world0/1052005.js
+++ b/scripts/npc/world0/1052005.js
--- a/scripts/npc/world0/1052006.js
+++ b/scripts/npc/world0/1052006.js
--- a/scripts/npc/world0/1052007.js
+++ b/scripts/npc/world0/1052007.js
--- a/scripts/npc/world0/1052008.js
+++ b/scripts/npc/world0/1052008.js
--- a/scripts/npc/world0/1052009.js
+++ b/scripts/npc/world0/1052009.js
--- a/scripts/npc/world0/1052010.js
+++ b/scripts/npc/world0/1052010.js
--- a/scripts/npc/world0/1052011.js
+++ b/scripts/npc/world0/1052011.js
--- a/scripts/npc/world0/1052016.js
+++ b/scripts/npc/world0/1052016.js
--- a/scripts/npc/world0/1052017.js
+++ b/scripts/npc/world0/1052017.js
--- a/scripts/npc/world0/1052100.js
+++ b/scripts/npc/world0/1052100.js
--- a/scripts/npc/world0/1052101.js
+++ b/scripts/npc/world0/1052101.js
--- a/scripts/npc/world0/1052115.js
+++ b/scripts/npc/world0/1052115.js
--- a/scripts/npc/world0/1052125.js
+++ b/scripts/npc/world0/1052125.js
--- a/scripts/npc/world0/1061000.js
+++ b/scripts/npc/world0/1061000.js
--- a/scripts/npc/world0/1061006.js
+++ b/scripts/npc/world0/1061006.js
--- a/scripts/npc/world0/1061007.js
+++ b/scripts/npc/world0/1061007.js
--- a/scripts/npc/world0/1061008.js
+++ b/scripts/npc/world0/1061008.js
--- a/scripts/npc/world0/1061009.js
+++ b/scripts/npc/world0/1061009.js
--- a/scripts/npc/world0/1061010.js
+++ b/scripts/npc/world0/1061010.js
--- a/scripts/npc/world0/1061012.js
+++ b/scripts/npc/world0/1061012.js
--- a/scripts/npc/world0/1061014.js
+++ b/scripts/npc/world0/1061014.js
--- a/scripts/npc/world0/1061016.js
+++ b/scripts/npc/world0/1061016.js
--- a/scripts/npc/world0/1061018.js
+++ b/scripts/npc/world0/1061018.js
--- a/scripts/npc/world0/1061100.js
+++ b/scripts/npc/world0/1061100.js
--- a/scripts/npc/world0/1063000.js
+++ b/scripts/npc/world0/1063000.js
--- a/scripts/npc/world0/1063001.js
+++ b/scripts/npc/world0/1063001.js
--- a/scripts/npc/world0/1063002.js
+++ b/scripts/npc/world0/1063002.js
--- a/scripts/npc/world0/1063012.js
+++ b/scripts/npc/world0/1063012.js
--- a/scripts/npc/world0/1063013.js
+++ b/scripts/npc/world0/1063013.js
--- a/scripts/npc/world0/1072000.js
+++ b/scripts/npc/world0/1072000.js
--- a/scripts/npc/world0/1072001.js
+++ b/scripts/npc/world0/1072001.js
--- a/scripts/npc/world0/1072002.js
+++ b/scripts/npc/world0/1072002.js
--- a/scripts/npc/world0/1072003.js
+++ b/scripts/npc/world0/1072003.js
--- a/scripts/npc/world0/1072004.js
+++ b/scripts/npc/world0/1072004.js
--- a/scripts/npc/world0/1072005.js
+++ b/scripts/npc/world0/1072005.js
--- a/scripts/npc/world0/1072006.js
+++ b/scripts/npc/world0/1072006.js
--- a/scripts/npc/world0/1072007.js
+++ b/scripts/npc/world0/1072007.js
--- a/scripts/npc/world0/1072008.js
+++ b/scripts/npc/world0/1072008.js
--- a/scripts/npc/world0/1081001.js
+++ b/scripts/npc/world0/1081001.js
--- a/scripts/npc/world0/1090000.js
+++ b/scripts/npc/world0/1090000.js
--- a/scripts/npc/world0/1091003.js
+++ b/scripts/npc/world0/1091003.js
--- a/Show More
+++ b/Show More