diff --git a/P3D/Content/Data/Scripts/ilex/spiky.dat b/P3D/Content/Data/Scripts/ilex/spiky.dat index ef5fe858b..f4ab69430 100644 --- a/P3D/Content/Data/Scripts/ilex/spiky.dat +++ b/P3D/Content/Data/Scripts/ilex/spiky.dat @@ -47,8 +47,8 @@ version=2 @register.register(spiky) @pokemon.cry(172) - @pokemon.add(172,50,Obtained at,5,Ilex Forest) - @pokemon.setadditionalvalue(-1,spiky-eared) + @pokemon.add(172_spiky-eared,50,Obtained at,161,Ilex Forest) + @pokemon.setshiny(-1,0) @pokemon.setgender(-1,1) @pokemon.clearattacks(-1) @@ -56,7 +56,6 @@ version=2 @pokemon.addattack(-1,207) @pokemon.addattack(-1,344) @pokemon.addattack(-1,220) - @pokemon.reloadall @sound.play(success_small) @text.show(Spiky-Eared Pichu has~joined your party!) @pokemon.rename(last) diff --git a/P3D/Content/Data/Scripts/trainer/fortune/water/002.trainer b/P3D/Content/Data/Scripts/trainer/fortune/water/002.trainer index ba321f4f7..89530a612 100644 --- a/P3D/Content/Data/Scripts/trainer/fortune/water/002.trainer +++ b/P3D/Content/Data/Scripts/trainer/fortune/water/002.trainer @@ -2,7 +2,7 @@ Name|Earl TrainerClass|Hiker Money|1944 -IntroMessage|Tell me where are the mountains~around these parts? +IntroMessage|Tell me, where are the~mountains around these parts? OutroMessage|I lost my way while I was busy battling! DefeatMessage|Aren't there any mountains~around these parts? TextureID|2 diff --git a/P3D/Content/Data/maps/battle/kolben/assoffices.dat b/P3D/Content/Data/maps/battle/kolben/assoffices.dat new file mode 100644 index 000000000..4421107a5 --- /dev/null +++ b/P3D/Content/Data/maps/battle/kolben/assoffices.dat @@ -0,0 +1,11 @@ +{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}} + +Walls: +{"EntityField"{ENT[{"EntityID"{str[WallBlock]}}{"Size"{intArr[16,3,9]}}{"Fill"{bool[0]}}{"Position"{sngArr[6,0,9]}}{"TexturePath"{str[kolben]}}{"Textures"{recArr[[0,32,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} + +Floor: +{"Floor"{ENT[{"Size"{intArr[14,7]}}{"Position"{intArr[7,0,10]}}{"TexturePath"{str[kolben]}}{"Texture"{rec[0,0,16,16]}}]}} + +Ceiling: +{"EntityField"{ENT[{"Size"{intArr[14,7]}}{"EntityID"{str[AllSidesObject]}}{"Position"{sngArr[7,3,10]}}{"TexturePath"{str[kolben]}}{"Textures"{recArr[[0,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} +