tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix for softlock scriptblocks with strengthrocks" 

This reverts commit 5003186b39.
This commit is contained in:
darkfire006 2022-08-06 18:22:13 -05:00
parent 5003186b39
commit 21bfdc2b74
18 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock1.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock2.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock3.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock4.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock5.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock6.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock7.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock8.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/hiderock9.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/unhiderock1.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/unhiderock23.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/unhiderock5.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/unhiderock6.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/unhiderock7.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/unhiderock8.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/underwatercave/rocks/unhiderock9.dat
View File

Binary file not shown.

16
P3D/Content/Data/maps/underwatercave/main.dat
View File

@ -604,15 +604,15 @@ Strength boulders in lava
{"Entity"{ENT[{"Scale"{sngArr[0.701,0.4,0.701]}}{"ID"{int[18]}}{"Visible"{bool[0]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[0,-0.7,10]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"Scale"{sngArr[0.701,0.4,0.701]}}{"ID"{int[19]}}{"Visible"{bool[0]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[1,-0.7,3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
Strength boulders blocking lava:
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[21]}}{"Visible"{bool[1]}}{"Position"{sngArr[1,0,26]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[22]}}{"Visible"{bool[1]}}{"Position"{sngArr[1,0,25]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[23]}}{"Visible"{bool[1]}}{"Position"{sngArr[2,0,26]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[24]}}{"Visible"{bool[1]}}{"Position"{sngArr[3,0,24]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[25]}}{"Visible"{bool[1]}}{"Position"{sngArr[2,0,18]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[21]}}{"Visible"{bool[0]}}{"Position"{sngArr[1,0,26]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[22]}}{"Visible"{bool[0]}}{"Position"{sngArr[1,0,25]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[23]}}{"Visible"{bool[0]}}{"Position"{sngArr[2,0,26]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[24]}}{"Visible"{bool[0]}}{"Position"{sngArr[3,0,24]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[25]}}{"Visible"{bool[0]}}{"Position"{sngArr[2,0,18]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[26]}}{"Visible"{bool[0]}}{"Position"{sngArr[15,0,18]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[27]}}{"Visible"{bool[1]}}{"Position"{sngArr[0,0,13]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[28]}}{"Visible"{bool[1]}}{"Position"{sngArr[0,0,10]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[29]}}{"Visible"{bool[1]}}{"Position"{sngArr[1,0,3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[27]}}{"Visible"{bool[0]}}{"Position"{sngArr[0,0,13]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[28]}}{"Visible"{bool[0]}}{"Position"{sngArr[0,0,10]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"ID"{int[29]}}{"Visible"{bool[0]}}{"Position"{sngArr[1,0,3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[224,13,13,7][224,0,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
Strengths Triggers:
{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"ID"{int[31]}}{"Position"{sngArr[1,0,26]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,96,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[1,1,underwatercave\rocks\rockdrop1]}}{"Visible"{bool[0]}}{"Rotation"{int[0]}}]}}
{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"ID"{int[32]}}{"Position"{sngArr[1,0,25]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,96,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[1,1,underwatercave\rocks\rockdrop2]}}{"Visible"{bool[0]}}{"Rotation"{int[0]}}]}}

2
P3D/Entites/Enviroment/ScriptBlock.vb
View File

@ -66,8 +66,6 @@
Screen.Camera.StopMovement()
ActivateScript = False
TriggerScript(False)
Else
TriggeredScriptBlock = False
End If
MyBase.Update()