Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

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

@@ -1,36 +1,29 @@
 version=2
-:if:<register.registered(petrelliberty)>=false
-	@npc.warp(1,12,2,14)
-	@npc.warp(2,13,2,15)
-	@npc.warp(3,14,2,15)
-	@npc.warp(4,15,2,12)
-	@npc.warp(5,16,2,9)
-	@npc.warp(6,26,2,9)
-
-	@npc.warp(21,15,2,15)
-	@npc.warp(22,33,2,26)
-	@npc.warp(23,34,2,12)
-	@npc.warp(24,30,2,16)
-	@npc.warp(25,36,2,20)
-	@npc.warp(26,28,2,24)
-	@npc.warp(27,20,2,27)
-	@npc.warp(28,23,3,22)
-	@npc.warp(29,14,2,23)
-	
-	@npc.warp(31,2,-7,28)
-	@npc.warp(32,8,-7,19)
-	@npc.warp(33,8,-7,18)
-	@npc.warp(34,13,-7,16)
-	@npc.warp(35,16,-7,9)
-	@npc.warp(36,26,-7,9)
-	@npc.warp(37,23,-7,20)
-	@npc.warp(38,17,-7,27)
-	@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
+:if:<register.registered(petrelliberty)>=true <and> <register.registered(lookerliberty)>=false
+	@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.remove(10)
+	@npc.remove(11)
+	@npc.remove(12)
+	@npc.remove(13)
+	@npc.remove(14)
+	@level.update
+	@level.wait(15)
+	@screen.fadein
+	@music.play(routemusic7)
 :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|position|2,1,28)
+@npc.register(liberty\garden.dat|32|position|8,2,19)
+@npc.register(liberty\garden.dat|33|position|8,2,18)
+@npc.register(liberty\garden.dat|34|position|13,2,16)
+@npc.register(liberty\garden.dat|35|position|16,2,9)
+@npc.register(liberty\garden.dat|36|position|26,2,9)
+@npc.register(liberty\garden.dat|37|position|23,3,20)
+@npc.register(liberty\garden.dat|38|position|17,2,27)
+@npc.register(liberty\garden.dat|39|position|33,2,17)
+@npc.register(liberty\garden.dat|40|position|41,1,8)
+@npc.register(liberty\garden.dat|41|position|33,2,26)
+
+@npc.register(liberty\garden.dat|1|remove|0)
+@npc.register(liberty\garden.dat|2|remove|0)
+@npc.register(liberty\garden.dat|3|remove|0)
+@npc.register(liberty\garden.dat|4|remove|0)
+@npc.register(liberty\garden.dat|5|remove|0)
+@npc.register(liberty\garden.dat|6|remove|0)
+
+@npc.register(liberty\garden.dat|21|remove|0)
+@npc.register(liberty\garden.dat|22|remove|0)
+@npc.register(liberty\garden.dat|23|remove|0)
+@npc.register(liberty\garden.dat|24|remove|0)
+@npc.register(liberty\garden.dat|25|remove|0)
+@npc.register(liberty\garden.dat|26|remove|0)
+@npc.register(liberty\garden.dat|27|remove|0)
+@npc.register(liberty\garden.dat|28|remove|0)
+@npc.register(liberty\garden.dat|29|remove|0)
 :endif
 :end

P3D/Content/Data/maps/kolben/lounge.dat

@@ -34,7 +34,14 @@ pillows:
 
 PC:
 {"Entity"{ENT[{"Scale"{sngArr[0.2,0.5,0.5]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[10.15,-0.1,9]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[96,80,5,11][101,80,11,11][101,91,11,5]]}}{"TextureIndex"{intArr[2,2,1,1,1,1,0,0,2,2,2,2]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[1]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,0,1.57]}}]}}
-{"Entity"{ENT[{"Scale"{sngArr[0.1,0.2,0.25]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[9.44,-0.1,9]}}{"TexturePath"{str[House]}}{"Textures"{recArr[[80,32,6,16][86,32,14,16][100,32,6,14]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,2,2]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+
+Wii:
+{"Entity"{ENT[{"Scale"{sngArr[0.1,0.2,0.25]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[9,-0.45,9]}}{"TexturePath"{str[House]}}{"Textures"{recArr[[80,32,6,16][86,32,14,16][100,32,6,14][99,32,1,16][99,47,1,1]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,3,3,2,2,4,4]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,2,1.57]}}]}}
+
+Switch:
+{"Entity"{ENT[{"Scale"{sngArr[0.3,0.2,0.1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[9.77,-0.1,9]}}{"TexturePath"{str[Switch]}}{"Textures"{recArr[[10,39,44,28][54,39,10,28][0,39,10,28][64,39,44,28][10,29,43,10]]}}{"TextureIndex"{intArr[0,0,1,1,2,2,3,3,4,4]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
+{"Entity"{ENT[{"Scale"{sngArr[0.45,0.2,0.04]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[9.75,-0.05,9]}}{"TexturePath"{str[Switch]}}{"Textures"{recArr[[66,0,62,29][128,0,4,29][62,0,4,29][0,0,62,29][66,33,62,4][66,29,62,4]]}}{"TextureIndex"{intArr[0,0,1,1,2,2,3,3,4,4,5,5]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}}
+
 
 Monitore:
 {"Entity"{ENT[{"Scale"{sngArr[4,2,0.2]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[9,1.2,9.4]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,80,32,16][48,96,32,4][80,80,4,16]]}}{"TextureIndex"{intArr[-1,-1,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}

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

@@ -455,38 +455,38 @@ Items:
 NPC:
 {"NPC"{NPC[{"Position"{sngArr[11,2,11]}}{"TextureID"{str[32]}}{"ID"{int[0]}}{"Name"{str[Sailor]}}{"Action"{int[1]}}{"AdditionalValue"{str[faraway\dockhand]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 
-{"NPC"{NPC[{"Position"{sngArr[12,-3,14]}}{"TextureID"{str[48]}}{"ID"{int[1]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Team Rocket has been~acting up in Unova.*I thought they were long~gone ever since their~Kanto and Johto failures.]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[13,-3,15]}}{"TextureID"{str[40]}}{"ID"{int[2]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Waaaah!*I'm scared!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[14,-3,15]}}{"TextureID"{str[94]}}{"ID"{int[3]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[They're making my grandchild~cry!*If they're underestimating~me because I'm old...~Grrr!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[15,-3,12]}}{"TextureID"{str[93]}}{"ID"{int[4]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[What are they doing in~this little memorial park?*There's nothing here but~an old lighthouse...]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[16,-3,9]}}{"TextureID"{str[92]}}{"ID"{int[5]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[What do they hope to~accomplish by occupying the~island?*This sketchy bunch can't~be after the Mythical~Pokémon, right?]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[26,-3,9]}}{"TextureID"{str[95]}}{"ID"{int[6]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[This officer's Pokémon~couldn't stand up to them~grunts!*Those blasting Rockets!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,2,14]}}{"TextureID"{str[48]}}{"ID"{int[1]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Team Rocket has been~acting up in Unova.*I thought they were long~gone ever since their~Kanto and Johto failures.]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[13,2,15]}}{"TextureID"{str[40]}}{"ID"{int[2]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Waaaah!*I'm scared!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[14,2,15]}}{"TextureID"{str[94]}}{"ID"{int[3]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[They're making my grandchild~cry!*If they're underestimating~me because I'm old...~Grrr!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[15,2,12]}}{"TextureID"{str[93]}}{"ID"{int[4]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[What are they doing in~this little memorial park?*There's nothing here but~an old lighthouse...]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[16,2,9]}}{"TextureID"{str[92]}}{"ID"{int[5]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[What do they hope to~accomplish by occupying the~island?*This sketchy bunch can't~be after the Mythical~Pokémon, right?]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[26,2,9]}}{"TextureID"{str[95]}}{"ID"{int[6]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[This officer's Pokémon~couldn't stand up to them~grunts!*Those blasting Rockets!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
 
-{"NPC"{NPC[{"Position"{sngArr[21,-1,22]}}{"TextureID"{str[looker]}}{"ID"{int[10]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[19,-1,23]}}{"TextureID"{str[95]}}{"ID"{int[11]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[20,-1,23]}}{"TextureID"{str[95]}}{"ID"{int[12]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[22,-1,23]}}{"TextureID"{str[95]}}{"ID"{int[13]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[23,-1,23]}}{"TextureID"{str[95]}}{"ID"{int[14]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[21,-3,22]}}{"TextureID"{str[looker]}}{"ID"{int[10]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[19,-3,23]}}{"TextureID"{str[95]}}{"ID"{int[11]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[20,-3,23]}}{"TextureID"{str[95]}}{"ID"{int[12]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[22,-3,23]}}{"TextureID"{str[95]}}{"ID"{int[13]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[23,-3,23]}}{"TextureID"{str[95]}}{"ID"{int[14]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 
-{"NPC"{NPC[{"Position"{sngArr[15,-5,15]}}{"TextureID"{str[gruntm]}}{"ID"{int[21]}}{"Name"{str[GruntM]}}{"Action"{int[0]}}{"AdditionalValue"{str[Stop right there!*If you stay in line quietly,~we won't be rough!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[33,-5,26]}}{"TextureID"{str[gruntm]}}{"ID"{int[22]}}{"Name"{str[GruntM]}}{"Action"{int[0]}}{"AdditionalValue"{str[What?*You're that guy I battled~back in the Sevii Islands.*Bugger off, I'm not letting~anyone near the Rocket~Submarine!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[15,2,15]}}{"TextureID"{str[gruntm]}}{"ID"{int[21]}}{"Name"{str[GruntM]}}{"Action"{int[0]}}{"AdditionalValue"{str[Stop right there!*If you stay in line quietly,~we won't be rough!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[33,2,26]}}{"TextureID"{str[gruntm]}}{"ID"{int[22]}}{"Name"{str[GruntM]}}{"Action"{int[0]}}{"AdditionalValue"{str[What?*You're that guy I battled~back in the Sevii Islands.*Bugger off, I'm not letting~anyone near the Rocket~Submarine!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 
-{"NPC"{NPC[{"Position"{sngArr[34,-5,12]}}{"TextureID"{str[gruntm]}}{"ID"{int[23]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[4|trainer\liberty\001]}}{"Rotation"{int[1]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[30,-5,16]}}{"TextureID"{str[gruntf]}}{"ID"{int[24]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[5|trainer\liberty\002]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[36,-5,20]}}{"TextureID"{str[gruntf]}}{"ID"{int[25]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[6|trainer\liberty\003]}}{"Rotation"{int[1]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[28,-5,24]}}{"TextureID"{str[gruntm]}}{"ID"{int[26]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[5|trainer\liberty\004]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[20,-5,27]}}{"TextureID"{str[gruntm]}}{"ID"{int[27]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[7|trainer\liberty\005]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[23,-5,22]}}{"TextureID"{str[gruntf]}}{"ID"{int[28]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[2|trainer\liberty\006]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[14,-5,23]}}{"TextureID"{str[gruntm]}}{"ID"{int[29]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[8|trainer\liberty\007]}}{"Rotation"{int[1]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[34,2,12]}}{"TextureID"{str[gruntm]}}{"ID"{int[23]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[4|trainer\liberty\001]}}{"Rotation"{int[1]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[30,2,16]}}{"TextureID"{str[gruntf]}}{"ID"{int[24]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[5|trainer\liberty\002]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[36,2,20]}}{"TextureID"{str[gruntf]}}{"ID"{int[25]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[6|trainer\liberty\003]}}{"Rotation"{int[1]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[28,2,24]}}{"TextureID"{str[gruntm]}}{"ID"{int[26]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[5|trainer\liberty\004]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[20,2,27]}}{"TextureID"{str[gruntm]}}{"ID"{int[27]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[7|trainer\liberty\005]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[23,3,22]}}{"TextureID"{str[gruntf]}}{"ID"{int[28]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[2|trainer\liberty\006]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[14,2,23]}}{"TextureID"{str[gruntm]}}{"ID"{int[29]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[8|trainer\liberty\007]}}{"Rotation"{int[1]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
 
-{"NPC"{NPC[{"Position"{sngArr[2,1,28]}}{"TextureID"{str[48]}}{"ID"{int[31]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[The smell of the ocean is~so soothing.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,2,19]}}{"TextureID"{str[40]}}{"ID"{int[32]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[You sure taught the bad~guys a lesson!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,2,18]}}{"TextureID"{str[94]}}{"ID"{int[33]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Thanks for your bravery.*You saved us!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[13,2,16]}}{"TextureID"{str[93]}}{"ID"{int[34]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Too many people use Pokémon~for bad deeds.*We owe you a lot!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[16,2,9]}}{"TextureID"{str[92]}}{"ID"{int[35]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[The rare Pokémon holds~incredible power and energy?*If only I knew...]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[26,2,9]}}{"TextureID"{str[95]}}{"ID"{int[36]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're doubling up on security~after that last incident.*The Liberty Lighthouse is a~monument we must protect.]}}{"Rotation"{int[3]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[24,11,31,6]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[23,3,20]}}{"TextureID"{str[95]}}{"ID"{int[37]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[Thanks for your assistance,~we'll be careful from now on.]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[17,2,27]}}{"TextureID"{str[38]}}{"ID"{int[38]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[I'm glad the memorial park~is now safe.*It's an antique building.]}}{"Rotation"{int[3]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[13,24,22,30]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[33,2,17]}}{"TextureID"{str[45]}}{"ID"{int[39]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[The seasonal colors in Unova~are truly special.]}}{"Rotation"{int[3]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[30,13,37,19]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[41,1,8]}}{"TextureID"{str[50]}}{"ID"{int[40]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Unova has many cool Pokémon.*Do you also have cool Pokémon~in your home region?]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[33,2,26]}}{"TextureID"{str[95]}}{"ID"{int[41]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're keeping our own~watercraft to secure the~island now.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[2,-1,28]}}{"TextureID"{str[48]}}{"ID"{int[31]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[The smell of the ocean is~so soothing.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,-2,19]}}{"TextureID"{str[40]}}{"ID"{int[32]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[You sure taught the bad~guys a lesson!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,-2,18]}}{"TextureID"{str[94]}}{"ID"{int[33]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Thanks for your bravery.*You saved us!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[13,-2,16]}}{"TextureID"{str[93]}}{"ID"{int[34]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Too many people use Pokémon~for bad deeds.*We owe you a lot!]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[16,-2,9]}}{"TextureID"{str[92]}}{"ID"{int[35]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[The rare Pokémon holds~incredible power and energy?*If only I knew...]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[26,-2,9]}}{"TextureID"{str[95]}}{"ID"{int[36]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're doubling up on security~after that last incident.*The Liberty Lighthouse is a~monument we must protect.]}}{"Rotation"{int[3]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[24,11,31,6]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[23,-3,20]}}{"TextureID"{str[95]}}{"ID"{int[37]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[Thanks for your assistance,~we'll be careful from now on.]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[17,-2,27]}}{"TextureID"{str[38]}}{"ID"{int[38]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[I'm glad the memorial park~is now safe.*It's an antique building.]}}{"Rotation"{int[3]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[13,24,22,30]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[33,-2,17]}}{"TextureID"{str[45]}}{"ID"{int[39]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[The seasonal colors in Unova~are truly special.]}}{"Rotation"{int[3]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[30,13,37,19]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[41,-1,8]}}{"TextureID"{str[50]}}{"ID"{int[40]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Unova has many cool Pokémon.*Do you also have cool Pokémon~in your home region?]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[33,-2,26]}}{"TextureID"{str[95]}}{"ID"{int[41]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're keeping our own~watercraft to secure the~island now.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}

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]}}]}}
@@ -69,5 +69,5 @@ Warps:
 NPC:
 {"NPC"{NPC[{"Position"{sngArr[2,0,13]}}{"TextureID"{str[95]}}{"ID"{int[1]}}{"Name"{str[Officer]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\heal]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
 
-{"NPC"{NPC[{"Position"{sngArr[1,-5,8]}}{"TextureID"{str[gruntf]}}{"ID"{int[2]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[7|trainer\liberty\inside\001]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[7,-5,4]}}{"TextureID"{str[gruntm]}}{"ID"{int[3]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[7|trainer\liberty\inside\002]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[1,-1,8]}}{"TextureID"{str[gruntf]}}{"ID"{int[2]}}{"Name"{str[GruntF]}}{"Action"{int[2]}}{"AdditionalValue"{str[7|trainer\liberty\inside\001]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[7,-2,4]}}{"TextureID"{str[gruntm]}}{"ID"{int[3]}}{"Name"{str[GruntM]}}{"Action"{int[2]}}{"AdditionalValue"{str[7|trainer\liberty\inside\002]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}

P3D/P3D.vbproj

@@ -8338,9 +8338,6 @@
     <Content Include="Content\Data\Scripts\trainer\lakeofrage\003.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\Scripts\trainer\league\bruno.trainer">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\Scripts\trainer\league\e4.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -8359,18 +8356,9 @@
     <Content Include="Content\Data\Scripts\trainer\league\false\will.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\Scripts\trainer\league\karen.trainer">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Data\Scripts\trainer\league\koga.trainer">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\Scripts\trainer\league\lance.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\Scripts\trainer\league\lance.trainer">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\Scripts\trainer\league\true\bruno.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -8386,9 +8374,6 @@
     <Content Include="Content\Data\Scripts\trainer\league\true\will.trainer">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\Scripts\trainer\league\will.trainer">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\Scripts\trainer\Lighthouse\001.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -25739,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>