Fix Liberty Island Scripts

P3D/Content/Data/Scripts/liberty/garden.dat

@@ -1,36 +1,29 @@
 version=2
-:if:<register.registered(petrelliberty)>=false
+:if:<register.registered(petrelliberty)>=true <and> <register.registered(lookerliberty)>=false
-	@npc.warp(1,12,2,14)
+	@npc.warp(10,21,3,22)
-	@npc.warp(2,13,2,15)
+	@npc.warp(11,19,3,23)
-	@npc.warp(3,14,2,15)
+	@npc.warp(12,20,3,23)
-	@npc.warp(4,15,2,12)
+	@npc.warp(13,22,3,23)
-	@npc.warp(5,16,2,9)
+	@npc.warp(14,23,3,23)
-	@npc.warp(6,26,2,9)
+	@camera.set(0,1,1.5,3.14,-0.46)
-
+	@player.move(0)
-	@npc.warp(21,15,2,15)
+	@level.update
-	@npc.warp(22,33,2,26)
+	@music.play(looker_encounter)
-	@npc.warp(23,34,2,12)
+	@text.show(Looker: <player.name>,~we meet again!*The International Police has~been investigating Team~Rocket's activity and they~seem to be reduced to~just a few rebel grunts.*They tried to escape in the~submarine after their leader's~defeat, but were surrounded~by our ships.~They'll face trial for~their misdeeds.*The International Police~expresses utmost gratitude~for your continued help~against Team Rocket with~this reward in money.)
-	@npc.warp(24,30,2,16)
+	@player.money(100000)
-	@npc.warp(25,36,2,20)
+	@text.show(You got a 100,000~Pokédollars reward!)
-	@npc.warp(26,28,2,24)
+	@text.show(Looker: We might end up~meeting again.*Farewell.)
-	@npc.warp(27,20,2,27)
+	@register.register(lookerliberty)
-	@npc.warp(28,23,3,22)
+	@screen.fadeout
-	@npc.warp(29,14,2,23)
+	@level.wait(15)
-	
+	@npc.remove(10)
-	@npc.warp(31,2,-7,28)
+	@npc.remove(11)
-	@npc.warp(32,8,-7,19)
+	@npc.remove(12)
-	@npc.warp(33,8,-7,18)
+	@npc.remove(13)
-	@npc.warp(34,13,-7,16)
+	@npc.remove(14)
-	@npc.warp(35,16,-7,9)
+	@level.update
-	@npc.warp(36,26,-7,9)
+	@level.wait(15)
-	@npc.warp(37,23,-7,20)
+	@screen.fadein
-	@npc.warp(38,17,-7,27)
+	@music.play(routemusic7)
-	@npc.warp(39,33,-7,17)
-	@npc.warp(40,41,-7,8)
-	@npc.warp(41,33,-7,26)
-:else
-	:if:<register.registered(lookerliberty)>=false
-		@script.start(liberty\looker)
-	:endif
 :endif
 :end

P3D/Content/Data/Scripts/liberty/interior.dat

@@ -1,6 +0,0 @@
-version=2
-:if:<register.registered(petrelliberty)>=false
-@npc.warp(2,1,-1,8)
-@npc.warp(3,7,-2,4)
-:endif
-:end

P3D/Content/Data/Scripts/liberty/looker.dat

@@ -1,27 +0,0 @@
-version=2
-@npc.warp(10,21,3,22)
-@npc.warp(11,19,3,23)
-@npc.warp(12,20,3,23)
-@npc.warp(13,22,3,23)
-@npc.warp(14,23,3,23)
-@camera.set(0,1,1.5,3.14,-0.46)
-@player.move(0)
-@level.update
-@music.play(looker_encounter)
-@text.show(Looker: <player.name>,~we meet again!*The International Police has~been investigating Team~Rocket's activity and they~seem to be reduced to~just a few rebel grunts.*They tried to escape in the~submarine after their leader's~defeat, but were surrounded~by our ships.~They'll face trial for~their misdeeds.*The International Police~expresses utmost gratitude~for your continued help~against Team Rocket with~this reward in money.)
-@player.money(100000)
-@text.show(You got a 100,000~Pokédollars reward!)
-@text.show(Looker: We might end up~meeting again.*Farewell.)
-@register.register(lookerliberty)
-@screen.fadeout
-@level.wait(15)
-@npc.warp(10,21,-1,22)
-@npc.warp(11,19,-1,23)
-@npc.warp(12,20,-1,23)
-@npc.warp(13,22,-1,23)
-@npc.warp(14,23,-1,23)
-@level.update
-@level.wait(15)
-@screen.fadein
-@music.play(routemusic7)
-:end

P3D/Content/Data/Scripts/liberty/room.dat

@@ -23,8 +23,41 @@ version=2
 @npc.turn(6,2)
 @npc.move(6,3)
 @level.wait(30)
-@npc.warp(6,4,-3,5)
+@npc.remove(6)
 @text.show(Victini looks like it's waiting~to test your strength.)
 @register.register(petrelliberty)
+
+@npc.register(liberty\room.dat|6|remove|0)
+@npc.register(liberty\interior.dat|2|remove|0)
+@npc.register(liberty\interior.dat|3|remove|0)
+
+@npc.register(liberty\garden.dat|31|remove|0)
+@npc.register(liberty\garden.dat|32|remove|0)
+@npc.register(liberty\garden.dat|33|remove|0)
+@npc.register(liberty\garden.dat|34|remove|0)
+@npc.register(liberty\garden.dat|35|remove|0)
+@npc.register(liberty\garden.dat|36|remove|0)
+@npc.register(liberty\garden.dat|37|remove|0)
+@npc.register(liberty\garden.dat|38|remove|0)
+@npc.register(liberty\garden.dat|39|remove|0)
+@npc.register(liberty\garden.dat|40|remove|0)
+@npc.register(liberty\garden.dat|41|remove|0)
+
+@npc.register(liberty\garden.dat|1|position|12,2,14)
+@npc.register(liberty\garden.dat|2|position|13,2,15)
+@npc.register(liberty\garden.dat|3|position|14,2,15)
+@npc.register(liberty\garden.dat|4|position|15,2,12)
+@npc.register(liberty\garden.dat|5|position|16,2,9)
+@npc.register(liberty\garden.dat|6|position|26,2,9)
+
+@npc.register(liberty\garden.dat|21|position|15,2,15)
+@npc.register(liberty\garden.dat|22|position|33,2,26)
+@npc.register(liberty\garden.dat|23|position|34,2,12)
+@npc.register(liberty\garden.dat|24|position|30,2,16)
+@npc.register(liberty\garden.dat|25|position|36,2,20)
+@npc.register(liberty\garden.dat|26|position|28,2,24)
+@npc.register(liberty\garden.dat|27|position|20,2,27)
+@npc.register(liberty\garden.dat|28|position|23,3,22)
+@npc.register(liberty\garden.dat|29|position|14,2,23)
 :endif
 :end

P3D/Content/Data/maps/liberty/interior.dat

@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Liberty Lighthouse]}}{"MusicLoop"{str[darkcave]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}{"MapScript"{str[liberty\interior]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[7,3]}}{"Position"{intArr[1,0,12]}}{"TexturePath"{str[park]}}{"Texture"{rec[0,80,16,16]}}]}}

P3D/P3D.vbproj

@@ -25724,12 +25724,6 @@
     <None Include="Content\Data\Scripts\liberty\heal.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Content\Data\Scripts\liberty\interior.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Content\Data\Scripts\liberty\looker.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Content\Data\Scripts\liberty\room.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>