diff --git a/P3D/Content/Data/Scripts/diamonddive/normaldown.dat b/P3D/Content/Data/Scripts/diamonddive/normaldown.dat index a3ade284a..f4c01ec65 100644 Binary files a/P3D/Content/Data/Scripts/diamonddive/normaldown.dat and b/P3D/Content/Data/Scripts/diamonddive/normaldown.dat differ diff --git a/P3D/Content/Data/Scripts/diamonddive/normalup.dat b/P3D/Content/Data/Scripts/diamonddive/normalup.dat index 29abfe3ca..5a6a4b35f 100644 Binary files a/P3D/Content/Data/Scripts/diamonddive/normalup.dat and b/P3D/Content/Data/Scripts/diamonddive/normalup.dat differ diff --git a/P3D/Entites/Other/MessageBulb.vb b/P3D/Entites/Other/MessageBulb.vb index d2172159b..9213c791b 100644 --- a/P3D/Entites/Other/MessageBulb.vb +++ b/P3D/Entites/Other/MessageBulb.vb @@ -2,7 +2,7 @@ Inherits Entity - Public Enum NotifcationTypes + Public Enum NotificationTypes Waiting = 0 Exclamation = 1 Shouting = 2 @@ -21,11 +21,11 @@ Unsure = 15 End Enum - Public NotificationType As NotifcationTypes = NotifcationTypes.Exclamation + Public NotificationType As NotificationTypes = NotificationTypes.Exclamation Dim setTexture As Boolean = False Dim delay As Single = 0.0F - Public Sub New(ByVal Position As Vector3, ByVal NotificationType As NotifcationTypes) + Public Sub New(ByVal Position As Vector3, ByVal NotificationType As NotificationTypes) MyBase.New(Position.X, Position.Y, Position.Z, "MessageBulb", {}, {0, 0}, False, 0, New Vector3(0.8F), BaseModel.BillModel, 0, "", New Vector3(1.0F)) Me.NotificationType = NotificationType @@ -52,37 +52,37 @@ Dim r As New Rectangle(0, 0, 16, 16) Select Case Me.NotificationType - Case NotifcationTypes.Waiting + Case NotificationTypes.Waiting r = New Rectangle(0, 0, 16, 16) - Case NotifcationTypes.Exclamation + Case NotificationTypes.Exclamation r = New Rectangle(16, 0, 16, 16) - Case NotifcationTypes.Shouting + Case NotificationTypes.Shouting r = New Rectangle(32, 0, 16, 16) - Case NotifcationTypes.Question + Case NotificationTypes.Question r = New Rectangle(48, 0, 16, 16) - Case NotifcationTypes.Note + Case NotificationTypes.Note r = New Rectangle(0, 16, 16, 16) - Case NotifcationTypes.Heart + Case NotificationTypes.Heart r = New Rectangle(16, 16, 16, 16) - Case NotifcationTypes.Unhappy + Case NotificationTypes.Unhappy r = New Rectangle(32, 16, 16, 16) - Case NotifcationTypes.Happy + Case NotificationTypes.Happy r = New Rectangle(0, 32, 16, 16) - Case NotifcationTypes.Friendly + Case NotificationTypes.Friendly r = New Rectangle(16, 32, 16, 16) - Case NotifcationTypes.Poisoned + Case NotificationTypes.Poisoned r = New Rectangle(32, 32, 16, 16) - Case NotifcationTypes.Battle + Case NotificationTypes.Battle r = New Rectangle(48, 16, 16, 16) - Case NotifcationTypes.Wink + Case NotificationTypes.Wink r = New Rectangle(48, 32, 16, 16) - Case NotifcationTypes.AFK + Case NotificationTypes.AFK r = New Rectangle(0, 48, 16, 16) - Case NotifcationTypes.Angry + Case NotificationTypes.Angry r = New Rectangle(16, 48, 16, 16) - Case NotifcationTypes.CatFace + Case NotificationTypes.CatFace r = New Rectangle(32, 48, 16, 16) - Case NotifcationTypes.Unsure + Case NotificationTypes.Unsure r = New Rectangle(48, 48, 16, 16) End Select diff --git a/P3D/Entites/Other/NetworkPlayer.vb b/P3D/Entites/Other/NetworkPlayer.vb index 0828b2ffe..135f1988d 100644 --- a/P3D/Entites/Other/NetworkPlayer.vb +++ b/P3D/Entites/Other/NetworkPlayer.vb @@ -270,11 +270,11 @@ Dim b As MessageBulb = Nothing Select Case BusyType Case "1" - b = New MessageBulb(New Vector3(Me.Position.X, Me.Position.Y + 1, Me.Position.Z), MessageBulb.NotifcationTypes.Battle) + b = New MessageBulb(New Vector3(Me.Position.X, Me.Position.Y + 1, Me.Position.Z), MessageBulb.NotificationTypes.Battle) Case "2" - b = New MessageBulb(New Vector3(Me.Position.X, Me.Position.Y + 1, Me.Position.Z), MessageBulb.NotifcationTypes.Waiting) + b = New MessageBulb(New Vector3(Me.Position.X, Me.Position.Y + 1, Me.Position.Z), MessageBulb.NotificationTypes.Waiting) Case "3" - b = New MessageBulb(New Vector3(Me.Position.X, Me.Position.Y + 1, Me.Position.Z), MessageBulb.NotifcationTypes.AFK) + b = New MessageBulb(New Vector3(Me.Position.X, Me.Position.Y + 1, Me.Position.Z), MessageBulb.NotificationTypes.AFK) End Select If Not b Is Nothing Then b.Visible = Me.Visible diff --git a/P3D/Pokemon/Monster/PokemonInteractions.vb b/P3D/Pokemon/Monster/PokemonInteractions.vb index 4f5afc332..8245d1e62 100644 --- a/P3D/Pokemon/Monster/PokemonInteractions.vb +++ b/P3D/Pokemon/Monster/PokemonInteractions.vb @@ -106,7 +106,7 @@ s &= "@camera.activatethirdperson" & Environment.NewLine & "@camera.setposition(" & newPosition.X & ",1," & newPosition.Y & ")" & Environment.NewLine - s &= "@entity.showmessagebulb(" & CInt(MessageBulb.NotifcationTypes.Question).ToString() & "|" & cPosition.X + offset.X & "|" & cPosition.Y + 0.7F & "|" & cPosition.Z + offset.Y & ")" & Environment.NewLine + s &= "@entity.showmessagebulb(" & CInt(MessageBulb.NotificationTypes.Question).ToString() & "|" & cPosition.X + offset.X & "|" & cPosition.Y + 0.7F & "|" & cPosition.Z + offset.Y & ")" & Environment.NewLine s &= "@camera.deactivatethirdperson" & Environment.NewLine s &= "@text.show(" & message & ")" & Environment.NewLine & @@ -121,7 +121,7 @@ ":endwhen" & Environment.NewLine Else s &= "@camera.setposition(" & newPosition.X & ",1," & newPosition.Y & ")" & Environment.NewLine - s &= "@entity.showmessagebulb(" & CInt(MessageBulb.NotifcationTypes.Question).ToString() & "|" & cPosition.X + offset.X & "|" & cPosition.Y + 0.7F & "|" & cPosition.Z + offset.Y & ")" & Environment.NewLine + s &= "@entity.showmessagebulb(" & CInt(MessageBulb.NotificationTypes.Question).ToString() & "|" & cPosition.X + offset.X & "|" & cPosition.Y + 0.7F & "|" & cPosition.Z + offset.Y & ")" & Environment.NewLine s &= "@camera.deactivatethirdperson" & Environment.NewLine @@ -230,39 +230,39 @@ Private Shared Function GetStatusConditionReaction(ByVal p As Pokemon) As ReactionContainer Select Case p.Status Case Pokemon.StatusProblems.BadPoison, Pokemon.StatusProblems.Poison - Return New ReactionContainer(" is shivering~with the effects of being~poisoned.", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(" is shivering~with the effects of being~poisoned.", MessageBulb.NotificationTypes.Poisoned) Case Pokemon.StatusProblems.Burn - Return New ReactionContainer("'s burn~looks painful!", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer("'s burn~looks painful!", MessageBulb.NotificationTypes.Poisoned) Case Pokemon.StatusProblems.Freeze Select Case Core.Random.Next(0, 2) Case 0 - Return New ReactionContainer(" seems very cold!", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(" seems very cold!", MessageBulb.NotificationTypes.Poisoned) Case 1 - Return New ReactionContainer(".....Your Pokémon seems~a little cold.", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(".....Your Pokémon seems~a little cold.", MessageBulb.NotificationTypes.Poisoned) End Select Case Pokemon.StatusProblems.Paralyzed - Return New ReactionContainer(" is trying~very hard to keep~up with you...", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(" is trying~very hard to keep~up with you...", MessageBulb.NotificationTypes.Poisoned) Case Pokemon.StatusProblems.Sleep Select Case Core.Random.Next(0, 3) Case 0 - Return New ReactionContainer(" seems~a little tiered.", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(" seems~a little tiered.", MessageBulb.NotificationTypes.Poisoned) Case 1 - Return New ReactionContainer(" is somehow~fighting off sleep...", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(" is somehow~fighting off sleep...", MessageBulb.NotificationTypes.Poisoned) Case 2 - Return New ReactionContainer(" yawned~very loudly!", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(" yawned~very loudly!", MessageBulb.NotificationTypes.Poisoned) End Select End Select - Return New ReactionContainer(" is trying~very hard to keep~up with you...", MessageBulb.NotifcationTypes.Poisoned) + Return New ReactionContainer(" is trying~very hard to keep~up with you...", MessageBulb.NotificationTypes.Poisoned) End Function Private Shared Function GetLowHPReaction(ByVal p As Pokemon) As ReactionContainer Select Case Core.Random.Next(0, 2) Case 0 - Return New ReactionContainer(" is going~to fall down!", MessageBulb.NotifcationTypes.Exclamation) + Return New ReactionContainer(" is going~to fall down!", MessageBulb.NotificationTypes.Exclamation) Case 1 - Return New ReactionContainer(" seems to~be about to fall over!", MessageBulb.NotifcationTypes.Exclamation) + Return New ReactionContainer(" seems to~be about to fall over!", MessageBulb.NotificationTypes.Exclamation) End Select - Return New ReactionContainer(" seems to~be about to fall over!", MessageBulb.NotifcationTypes.Exclamation) + Return New ReactionContainer(" seems to~be about to fall over!", MessageBulb.NotificationTypes.Exclamation) End Function Private Shared Function GetSpecialReaction(ByVal p As Pokemon) As ReactionContainer @@ -293,41 +293,41 @@ While r Is Nothing Select Case Core.Random.Next(0, 17) Case 0 - r = New ReactionContainer(" is doing~it's best to keep up~with you.", MessageBulb.NotifcationTypes.Unhappy) + r = New ReactionContainer(" is doing~it's best to keep up~with you.", MessageBulb.NotificationTypes.Unhappy) Case 1 - r = New ReactionContainer(" is somehow~forcing itself to keep going.", MessageBulb.NotifcationTypes.Unsure) + r = New ReactionContainer(" is somehow~forcing itself to keep going.", MessageBulb.NotificationTypes.Unsure) Case 2 - r = New ReactionContainer(" is staring~patiantly at nothing at all.", MessageBulb.NotifcationTypes.Unsure) + r = New ReactionContainer(" is staring~patiantly at nothing at all.", MessageBulb.NotificationTypes.Unsure) Case 3 - r = New ReactionContainer(" is staring~intently into the distance.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is staring~intently into the distance.", MessageBulb.NotificationTypes.Waiting) Case 4 - r = New ReactionContainer(" is dizzy...", MessageBulb.NotifcationTypes.Unhappy) + r = New ReactionContainer(" is dizzy...", MessageBulb.NotificationTypes.Unhappy) Case 5 - r = New ReactionContainer(" is stepping~on your feet!", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is stepping~on your feet!", MessageBulb.NotificationTypes.Waiting) Case 6 - r = New ReactionContainer(" seems~unhappy somehow...", MessageBulb.NotifcationTypes.Unhappy) + r = New ReactionContainer(" seems~unhappy somehow...", MessageBulb.NotificationTypes.Unhappy) Case 7 - r = New ReactionContainer(" is making~an unhappy face.", MessageBulb.NotifcationTypes.Unhappy) + r = New ReactionContainer(" is making~an unhappy face.", MessageBulb.NotificationTypes.Unhappy) Case 8 - r = New ReactionContainer(" seems~uneasy and is poking~.", MessageBulb.NotifcationTypes.Unsure) + r = New ReactionContainer(" seems~uneasy and is poking~.", MessageBulb.NotificationTypes.Unsure) Case 9 - r = New ReactionContainer(" is making~a face like its angry!", MessageBulb.NotifcationTypes.Angry) + r = New ReactionContainer(" is making~a face like its angry!", MessageBulb.NotificationTypes.Angry) Case 10 - r = New ReactionContainer(" seems to be~angry for some reason.", MessageBulb.NotifcationTypes.Angry) + r = New ReactionContainer(" seems to be~angry for some reason.", MessageBulb.NotificationTypes.Angry) Case 11 - r = New ReactionContainer("Your Pokémon turned to face~the other way, showing a~defiant expression. ", MessageBulb.NotifcationTypes.Unsure) + r = New ReactionContainer("Your Pokémon turned to face~the other way, showing a~defiant expression. ", MessageBulb.NotificationTypes.Unsure) Case 12 - r = New ReactionContainer(" is looking~down steadily...", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is looking~down steadily...", MessageBulb.NotificationTypes.Waiting) Case 13 - r = New ReactionContainer("Your Pokémon is staring~intently at nothing...", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer("Your Pokémon is staring~intently at nothing...", MessageBulb.NotificationTypes.Waiting) Case 14 - r = New ReactionContainer("Your Pokémon turned to~face the other way,~showing a defiant expression.", MessageBulb.NotifcationTypes.Unhappy) + r = New ReactionContainer("Your Pokémon turned to~face the other way,~showing a defiant expression.", MessageBulb.NotificationTypes.Unhappy) Case 15 - r = New ReactionContainer(" seems~a bit nervous...", MessageBulb.NotifcationTypes.Unsure) + r = New ReactionContainer(" seems~a bit nervous...", MessageBulb.NotificationTypes.Unsure) Case 16 - r = New ReactionContainer("Your Pokémon stumbled~and nearly fell!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer("Your Pokémon stumbled~and nearly fell!", MessageBulb.NotificationTypes.Exclamation) Case 17 - r = New ReactionContainer(" is having~a hard time keeping up.", MessageBulb.NotifcationTypes.Unsure) + r = New ReactionContainer(" is having~a hard time keeping up.", MessageBulb.NotificationTypes.Unsure) End Select End While @@ -339,180 +339,180 @@ While r Is Nothing Select Case Core.Random.Next(0, 53) Case 0 - r = New ReactionContainer(" is happy~but shy.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is happy~but shy.", MessageBulb.NotificationTypes.Friendly) Case 1 - r = New ReactionContainer(" puts in~extra effort.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" puts in~extra effort.", MessageBulb.NotificationTypes.Friendly) Case 2 If IsOutside() = True Then - r = New ReactionContainer(" is smelling~the scents of the~surrounding air", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is smelling~the scents of the~surrounding air", MessageBulb.NotificationTypes.Friendly) End If Case 3 If IsOutside() = True Then - r = New ReactionContainer("Your Pokémon has caught~the scent of smoke.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer("Your Pokémon has caught~the scent of smoke.", MessageBulb.NotificationTypes.Friendly) End If Case 4 If NPCAround() = True Then - r = New ReactionContainer(" greeted everyone!", MessageBulb.NotifcationTypes.CatFace) + r = New ReactionContainer(" greeted everyone!", MessageBulb.NotificationTypes.CatFace) End If Case 5 If IsOutside() = True Then - r = New ReactionContainer(" is wandering~around and listening~to the different sounds.", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is wandering~around and listening~to the different sounds.", MessageBulb.NotificationTypes.Note) End If Case 6 - r = New ReactionContainer(" looks very~interested!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" looks very~interested!", MessageBulb.NotificationTypes.Friendly) Case 7 If IsOutside() = True Then - r = New ReactionContainer(" is steadily~poking at the ground.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is steadily~poking at the ground.", MessageBulb.NotificationTypes.Waiting) End If Case 8 - r = New ReactionContainer("Your Pokémon is looking~around restlessly.", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer("Your Pokémon is looking~around restlessly.", MessageBulb.NotificationTypes.Note) Case 9 If IsOutside() = True Then - r = New ReactionContainer(" seems dazzled~after seeing the sky.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" seems dazzled~after seeing the sky.", MessageBulb.NotificationTypes.Waiting) End If Case 10 - r = New ReactionContainer(" is gazing~around restlessly!", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is gazing~around restlessly!", MessageBulb.NotificationTypes.Waiting) Case 11 If TrainerAround() = True Then - r = New ReactionContainer(" let out~a battle cry!", MessageBulb.NotifcationTypes.Shouting) + r = New ReactionContainer(" let out~a battle cry!", MessageBulb.NotificationTypes.Shouting) End If Case 12 If TrainerAround() = True And p.IsType(Element.Types.Fire) = True Then - r = New ReactionContainer(" is vigorously~breathing fire!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" is vigorously~breathing fire!", MessageBulb.NotificationTypes.Exclamation) End If Case 13 If TrainerAround() = True Or NPCAround() = True Then - r = New ReactionContainer(" is on~the lookout!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" is on~the lookout!", MessageBulb.NotificationTypes.Exclamation) End If Case 14 If TrainerAround() = True Then - r = New ReactionContainer(" roared!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" roared!", MessageBulb.NotificationTypes.Exclamation) End If Case 15 If TrainerAround() = True Then - r = New ReactionContainer(" let out a roar!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" let out a roar!", MessageBulb.NotificationTypes.Exclamation) End If Case 16 - r = New ReactionContainer(" is surveying~the area...", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is surveying~the area...", MessageBulb.NotificationTypes.Waiting) Case 17 If IsInside() = True Then - r = New ReactionContainer(" is sniffing~at the floor.", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer(" is sniffing~at the floor.", MessageBulb.NotificationTypes.Question) End If Case 18 - r = New ReactionContainer(" is peering~down.", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer(" is peering~down.", MessageBulb.NotificationTypes.Question) Case 19 - r = New ReactionContainer(" seems~to be wandering around.", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" seems~to be wandering around.", MessageBulb.NotificationTypes.Note) Case 20 - r = New ReactionContainer(" is looking~around absentmindedly.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is looking~around absentmindedly.", MessageBulb.NotificationTypes.Waiting) Case 21 - r = New ReactionContainer(" is relaxing~comfortably.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is relaxing~comfortably.", MessageBulb.NotificationTypes.Friendly) Case 22 If IsInside() = True Then - r = New ReactionContainer(" is sniffing~at the floor.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is sniffing~at the floor.", MessageBulb.NotificationTypes.Waiting) End If Case 23 If IsOutside() = True Then - r = New ReactionContainer(" seems to~relax as it hears the~sound of rustling leaves...", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" seems to~relax as it hears the~sound of rustling leaves...", MessageBulb.NotificationTypes.Friendly) End If Case 24 If IsOutside() = True Then - r = New ReactionContainer(" seems to~be listening to the~sound of rustling leaves...", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" seems to~be listening to the~sound of rustling leaves...", MessageBulb.NotificationTypes.Friendly) End If Case 25 If WaterAround() = True Then - r = New ReactionContainer("Your Pokémon is playing around~and splashing in the water!", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer("Your Pokémon is playing around~and splashing in the water!", MessageBulb.NotificationTypes.Happy) End If Case 26 If IsOutside() = True Then - r = New ReactionContainer(" is looking~up at the sky.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is looking~up at the sky.", MessageBulb.NotificationTypes.Waiting) End If Case 27 If IsOutside() = True And World.GetTime() = World.DayTimes.Night And World.GetCurrentRegionWeather() = World.Weathers.Clear Then - r = New ReactionContainer("Your Pokémon is happily~gazing at the beautiful,~starry sky!", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer("Your Pokémon is happily~gazing at the beautiful,~starry sky!", MessageBulb.NotificationTypes.Waiting) End If Case 28 - r = New ReactionContainer(" seems to be~enjoying this a little bit!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" seems to be~enjoying this a little bit!", MessageBulb.NotificationTypes.Note) Case 29 If IsInside() = True Then - r = New ReactionContainer(" is looking~up at the ceiling.", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is looking~up at the ceiling.", MessageBulb.NotificationTypes.Note) End If Case 30 If IsOutside() = True And World.GetTime() = World.DayTimes.Night Then - r = New ReactionContainer("Your Pokémon is staring~spellbound at the night sky!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer("Your Pokémon is staring~spellbound at the night sky!", MessageBulb.NotificationTypes.Friendly) End If Case 31 - r = New ReactionContainer(" is in~danger of falling over!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" is in~danger of falling over!", MessageBulb.NotificationTypes.Exclamation) Case 32 If p.NickName <> "" Then - r = New ReactionContainer(" doesn't~seem to be used to its~own name yet.", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" doesn't~seem to be used to its~own name yet.", MessageBulb.NotificationTypes.Exclamation) End If Case 33 If IsInside() = True Then - r = New ReactionContainer(" slipped~on the floor and seems~likely to fall!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" slipped~on the floor and seems~likely to fall!", MessageBulb.NotificationTypes.Exclamation) End If Case 34 If TrainerAround() = True Or GrassAround() = True Then - r = New ReactionContainer(" feels something~and is howling!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" feels something~and is howling!", MessageBulb.NotificationTypes.Exclamation) End If Case 35 If p.HP = p.MaxHP And p.Status = Pokemon.StatusProblems.None Then - r = New ReactionContainer(" seems~refreshed!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" seems~refreshed!", MessageBulb.NotificationTypes.Friendly) End If Case 36 If p.HP = p.MaxHP And p.Status = Pokemon.StatusProblems.None Then - r = New ReactionContainer(" feels~refreshed.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" feels~refreshed.", MessageBulb.NotificationTypes.Friendly) End If Case 37 If ItemAround() = True Then - r = New ReactionContainer(" seems to~have found something!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" seems to~have found something!", MessageBulb.NotificationTypes.Exclamation) End If Case 38 If TrainerAround() = True Or GrassAround() = True Then - r = New ReactionContainer(" suddenly~turned around and~started barking!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" suddenly~turned around and~started barking!", MessageBulb.NotificationTypes.Exclamation) End If Case 39 If TrainerAround() = True Or GrassAround() = True Then - r = New ReactionContainer(" suddenly~turned around!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" suddenly~turned around!", MessageBulb.NotificationTypes.Exclamation) End If Case 40 If IsOutside() = True Then - r = New ReactionContainer(" looked up~at the sky and shouted loudly!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" looked up~at the sky and shouted loudly!", MessageBulb.NotificationTypes.Exclamation) End If Case 41 - r = New ReactionContainer("Your Pokémon was surprised~that you suddenly spoke to it!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer("Your Pokémon was surprised~that you suddenly spoke to it!", MessageBulb.NotificationTypes.Exclamation) Case 42 If Not p.Item Is Nothing Then - r = New ReactionContainer(" almost forgot~it was holding~that " & p.Item.Name & "!", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer(" almost forgot~it was holding~that " & p.Item.Name & "!", MessageBulb.NotificationTypes.Question) End If Case 43 If IceAround() = True Then - r = New ReactionContainer("Oh!~its slipping and came~over here for support.", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer("Oh!~its slipping and came~over here for support.", MessageBulb.NotificationTypes.Exclamation) End If Case 44 If IceAround() = True Then - r = New ReactionContainer("Your Pokémon almost slipped~and fell over!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer("Your Pokémon almost slipped~and fell over!", MessageBulb.NotificationTypes.Exclamation) End If Case 45 - r = New ReactionContainer(" sensed something~strange and was surprised!", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer(" sensed something~strange and was surprised!", MessageBulb.NotificationTypes.Question) Case 46 - r = New ReactionContainer("Your Pokémon is looking~around restlessly for~something.", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer("Your Pokémon is looking~around restlessly for~something.", MessageBulb.NotificationTypes.Question) Case 47 - r = New ReactionContainer("Your Pokémon wasn't watching~where it was going and~ran into you!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer("Your Pokémon wasn't watching~where it was going and~ran into you!", MessageBulb.NotificationTypes.Friendly) Case 48 If ItemAround() = True Then - r = New ReactionContainer("Sniff, sniff!~Is there something nearby?", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer("Sniff, sniff!~Is there something nearby?", MessageBulb.NotificationTypes.Question) End If Case 49 - r = New ReactionContainer(" is wandering~around and searching~for something.", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer(" is wandering~around and searching~for something.", MessageBulb.NotificationTypes.Question) Case 50 - r = New ReactionContainer(" is sniffing~at .", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is sniffing~at .", MessageBulb.NotificationTypes.Friendly) Case 51 If IsOutside() = True And World.GetCurrentRegionWeather() = World.Weathers.Rain And GrassAround() = True Then - r = New ReactionContainer(" is taking shelter in the grass from the rain!", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is taking shelter in the grass from the rain!", MessageBulb.NotificationTypes.Waiting) End If Case 52 If IsOutside() = True And World.GetCurrentRegionWeather() = World.Weathers.Rain And GrassAround() = True Then - r = New ReactionContainer(" is splashing~around in the wet grass", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is splashing~around in the wet grass", MessageBulb.NotificationTypes.Note) End If End Select End While @@ -525,71 +525,71 @@ Select Case Core.Random.Next(0, 28) Case 0 If IsOutside() = True And World.GetCurrentRegionWeather() = World.Weathers.Clear Then - r = New ReactionContainer("Your Pokémon seems happy~about the great weather!", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer("Your Pokémon seems happy~about the great weather!", MessageBulb.NotificationTypes.Happy) End If Case 1 - r = New ReactionContainer(" is coming along~happily.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is coming along~happily.", MessageBulb.NotificationTypes.Friendly) Case 2 - r = New ReactionContainer(" is composed!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is composed!", MessageBulb.NotificationTypes.Friendly) Case 3 If p.HP = p.MaxHP Then - r = New ReactionContainer(" is glowing~with health!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is glowing~with health!", MessageBulb.NotificationTypes.Note) End If Case 4 - r = New ReactionContainer(" looks~very happy!", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer(" looks~very happy!", MessageBulb.NotificationTypes.Happy) Case 5 If p.HP = p.MaxHP Then - r = New ReactionContainer(" is full~of life!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is full~of life!", MessageBulb.NotificationTypes.Note) End If Case 6 - r = New ReactionContainer(" is very~eager!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is very~eager!", MessageBulb.NotificationTypes.Friendly) Case 7 - r = New ReactionContainer(" gives you~a happy look and a smile!", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer(" gives you~a happy look and a smile!", MessageBulb.NotificationTypes.Happy) Case 8 - r = New ReactionContainer(" seems very~happy to see you!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" seems very~happy to see you!", MessageBulb.NotificationTypes.Friendly) Case 9 - r = New ReactionContainer(" faced this~way and grinned!", MessageBulb.NotifcationTypes.CatFace) + r = New ReactionContainer(" faced this~way and grinned!", MessageBulb.NotificationTypes.CatFace) Case 10 - r = New ReactionContainer(" spun around~in a circle!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" spun around~in a circle!", MessageBulb.NotificationTypes.Note) Case 11 - r = New ReactionContainer(" is looking~this way and smiling.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is looking~this way and smiling.", MessageBulb.NotificationTypes.Friendly) Case 12 - r = New ReactionContainer(" is very~eager...", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is very~eager...", MessageBulb.NotificationTypes.Waiting) Case 13 - r = New ReactionContainer(" is focusing~its attention on you!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" is focusing~its attention on you!", MessageBulb.NotificationTypes.Exclamation) Case 14 - r = New ReactionContainer(" focused~with a sharp gaze!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" focused~with a sharp gaze!", MessageBulb.NotificationTypes.Exclamation) Case 15 - r = New ReactionContainer(" is looking~at 's footprints.", MessageBulb.NotifcationTypes.Question) + r = New ReactionContainer(" is looking~at 's footprints.", MessageBulb.NotificationTypes.Question) Case 16 - r = New ReactionContainer(" is staring~straight into 's~eyes.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is staring~straight into 's~eyes.", MessageBulb.NotificationTypes.Friendly) Case 17 If p.BaseSpeed >= 100 Then - r = New ReactionContainer(" is showing off~its agility!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is showing off~its agility!", MessageBulb.NotificationTypes.Note) End If Case 18 - r = New ReactionContainer(" is moving~around happily!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is moving~around happily!", MessageBulb.NotificationTypes.Note) Case 19 - r = New ReactionContainer(" is steadily~keeping up with you!", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is steadily~keeping up with you!", MessageBulb.NotificationTypes.Friendly) Case 20 - r = New ReactionContainer(" seems to~want to play with~!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" seems to~want to play with~!", MessageBulb.NotificationTypes.Note) Case 21 - r = New ReactionContainer(" is singing~and humming.", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is singing~and humming.", MessageBulb.NotificationTypes.Note) Case 22 - r = New ReactionContainer(" is playfully~nibbling at the ground.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" is playfully~nibbling at the ground.", MessageBulb.NotificationTypes.Friendly) Case 23 - r = New ReactionContainer(" is nipping~at your feet!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is nipping~at your feet!", MessageBulb.NotificationTypes.Note) Case 24 If p.BaseAttack >= 100 Or p.BaseSpAttack >= 100 Then - r = New ReactionContainer(" is working~hard to show off~its mighty power!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" is working~hard to show off~its mighty power!", MessageBulb.NotificationTypes.Exclamation) End If Case 25 - r = New ReactionContainer(" is cheerful!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is cheerful!", MessageBulb.NotificationTypes.Note) Case 26 - r = New ReactionContainer(" bumped~into !", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" bumped~into !", MessageBulb.NotificationTypes.Exclamation) Case 27 If IsCave() = True And p.Level < 20 Then - r = New ReactionContainer(" is scared~and snuggled up~to !", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" is scared~and snuggled up~to !", MessageBulb.NotificationTypes.Exclamation) End If End Select End While @@ -601,51 +601,51 @@ While r Is Nothing Select Case Core.Random.Next(0, 21) Case 0 - r = New ReactionContainer(" began poking~you in the stomach!", MessageBulb.NotifcationTypes.CatFace) + r = New ReactionContainer(" began poking~you in the stomach!", MessageBulb.NotificationTypes.CatFace) Case 1 - r = New ReactionContainer(" seems to be~feeling great about~walking with you!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" seems to be~feeling great about~walking with you!", MessageBulb.NotificationTypes.Heart) Case 2 - r = New ReactionContainer(" is still~feeling great!", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer(" is still~feeling great!", MessageBulb.NotificationTypes.Happy) Case 3 - r = New ReactionContainer(" is poking~at your belly.", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" is poking~at your belly.", MessageBulb.NotificationTypes.Heart) Case 4 If p.Level > 30 Then - r = New ReactionContainer(" looks like~it wants to lead!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" looks like~it wants to lead!", MessageBulb.NotificationTypes.Note) End If Case 5 - r = New ReactionContainer(" seems to be~very happy!", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer(" seems to be~very happy!", MessageBulb.NotificationTypes.Happy) Case 6 - r = New ReactionContainer(" nodded slowly.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" nodded slowly.", MessageBulb.NotificationTypes.Friendly) Case 7 - r = New ReactionContainer(" gave you~a sunny look!", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer(" gave you~a sunny look!", MessageBulb.NotificationTypes.Happy) Case 8 - r = New ReactionContainer(" is very~composed and sure of itself!", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is very~composed and sure of itself!", MessageBulb.NotificationTypes.Waiting) Case 9 If p.BaseDefense >= 100 Then - r = New ReactionContainer(" is~standing guard!", MessageBulb.NotifcationTypes.Exclamation) + r = New ReactionContainer(" is~standing guard!", MessageBulb.NotificationTypes.Exclamation) End If Case 10 - r = New ReactionContainer(" danced a~wonderful dance!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" danced a~wonderful dance!", MessageBulb.NotificationTypes.Note) Case 11 - r = New ReactionContainer(" is staring~steadfastly at~'s face.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is staring~steadfastly at~'s face.", MessageBulb.NotificationTypes.Waiting) Case 12 - r = New ReactionContainer(" is staring~intently at~'s face.", MessageBulb.NotifcationTypes.Waiting) + r = New ReactionContainer(" is staring~intently at~'s face.", MessageBulb.NotificationTypes.Waiting) Case 13 - r = New ReactionContainer(" is concentrating.", MessageBulb.NotifcationTypes.Unsure) + r = New ReactionContainer(" is concentrating.", MessageBulb.NotificationTypes.Unsure) Case 14 - r = New ReactionContainer(" faced this~way and nodded.", MessageBulb.NotifcationTypes.Friendly) + r = New ReactionContainer(" faced this~way and nodded.", MessageBulb.NotificationTypes.Friendly) Case 15 - r = New ReactionContainer(" suddenly~started walking closer!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" suddenly~started walking closer!", MessageBulb.NotificationTypes.Heart) Case 16 - r = New ReactionContainer("Woah!* is suddenly~playful!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer("Woah!* is suddenly~playful!", MessageBulb.NotificationTypes.Heart) Case 17 - r = New ReactionContainer(" blushes.", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer(" blushes.", MessageBulb.NotificationTypes.Happy) Case 18 - r = New ReactionContainer("Woah!* suddenly started~dancing in happiness!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer("Woah!* suddenly started~dancing in happiness!", MessageBulb.NotificationTypes.Note) Case 19 - r = New ReactionContainer(" is happily~skipping about.", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is happily~skipping about.", MessageBulb.NotificationTypes.Note) Case 20 - r = New ReactionContainer("Woah!* suddenly~danced in happiness!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer("Woah!* suddenly~danced in happiness!", MessageBulb.NotificationTypes.Note) End Select End While Return r @@ -656,35 +656,35 @@ While r Is Nothing Select Case Core.Random.Next(0, 13) Case 0 - r = New ReactionContainer(" is jumping~for joy!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" is jumping~for joy!", MessageBulb.NotificationTypes.Heart) Case 1 - r = New ReactionContainer("Your Pokémon stretched out~its body and is relaxing.", MessageBulb.NotifcationTypes.Happy) + r = New ReactionContainer("Your Pokémon stretched out~its body and is relaxing.", MessageBulb.NotificationTypes.Happy) Case 2 - r = New ReactionContainer(" is happily~cuddling up to you!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" is happily~cuddling up to you!", MessageBulb.NotificationTypes.Heart) Case 3 - r = New ReactionContainer(" is so happy~that it can't stand still!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" is so happy~that it can't stand still!", MessageBulb.NotificationTypes.Heart) Case 4 If p.PokedexEntry.Height <= 1.6F Then - r = New ReactionContainer(" happily~cuddled up to you!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" happily~cuddled up to you!", MessageBulb.NotificationTypes.Heart) End If Case 5 - r = New ReactionContainer("'s cheeks are~becoming rosy!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer("'s cheeks are~becoming rosy!", MessageBulb.NotificationTypes.Heart) Case 6 - r = New ReactionContainer("Woah!* suddenly~hugged you!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer("Woah!* suddenly~hugged you!", MessageBulb.NotificationTypes.Heart) Case 7 If p.PokedexEntry.Height <= 0.7F Then - r = New ReactionContainer(" is rubbing~against your legs!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" is rubbing~against your legs!", MessageBulb.NotificationTypes.Heart) End If Case 8 - r = New ReactionContainer("Ah!~ cuddles you!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer("Ah!~ cuddles you!", MessageBulb.NotificationTypes.Heart) Case 9 - r = New ReactionContainer(" is regarding~you with adoration!", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" is regarding~you with adoration!", MessageBulb.NotificationTypes.Heart) Case 10 - r = New ReactionContainer(" got~closer to !", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" got~closer to !", MessageBulb.NotificationTypes.Heart) Case 11 - r = New ReactionContainer(" is keeping~close to your feet.", MessageBulb.NotifcationTypes.Heart) + r = New ReactionContainer(" is keeping~close to your feet.", MessageBulb.NotificationTypes.Heart) Case 12 - r = New ReactionContainer(" is jumping~around in a carefree way!", MessageBulb.NotifcationTypes.Note) + r = New ReactionContainer(" is jumping~around in a carefree way!", MessageBulb.NotificationTypes.Note) End Select End While Return r @@ -713,7 +713,7 @@ Private Class ReactionContainer Public Message As String - Public Notification As MessageBulb.NotifcationTypes = MessageBulb.NotifcationTypes.AFK + Public Notification As MessageBulb.NotificationTypes = MessageBulb.NotificationTypes.AFK Public HasNotification As Boolean = True Public MapFiles As New List(Of String) Public PokemonIDs As New List(Of Integer) @@ -774,48 +774,48 @@ Me.Message = dataParts(8) End Sub - Public Sub New(ByVal Message As String, ByVal Notification As MessageBulb.NotifcationTypes) + Public Sub New(ByVal Message As String, ByVal Notification As MessageBulb.NotificationTypes) Me.Message = Message Me.Notification = Notification End Sub - Private Function ConvertEmoji(ByVal s As String) As MessageBulb.NotifcationTypes + Private Function ConvertEmoji(ByVal s As String) As MessageBulb.NotificationTypes Select Case s.ToLower() Case "..." - Return MessageBulb.NotifcationTypes.Waiting + Return MessageBulb.NotificationTypes.Waiting Case "!" - Return MessageBulb.NotifcationTypes.Exclamation + Return MessageBulb.NotificationTypes.Exclamation Case ">:(" - Return MessageBulb.NotifcationTypes.Shouting + Return MessageBulb.NotificationTypes.Shouting Case "?" - Return MessageBulb.NotifcationTypes.Question + Return MessageBulb.NotificationTypes.Question Case "note" - Return MessageBulb.NotifcationTypes.Note + Return MessageBulb.NotificationTypes.Note Case "<3" - Return MessageBulb.NotifcationTypes.Heart + Return MessageBulb.NotificationTypes.Heart Case ":(" - Return MessageBulb.NotifcationTypes.Unhappy + Return MessageBulb.NotificationTypes.Unhappy Case "ball" - Return MessageBulb.NotifcationTypes.Battle + Return MessageBulb.NotificationTypes.Battle Case ":D" - Return MessageBulb.NotifcationTypes.Happy + Return MessageBulb.NotificationTypes.Happy Case ":)" - Return MessageBulb.NotifcationTypes.Friendly + Return MessageBulb.NotificationTypes.Friendly Case "bad" - Return MessageBulb.NotifcationTypes.Poisoned + Return MessageBulb.NotificationTypes.Poisoned Case ";)" - Return MessageBulb.NotifcationTypes.Wink + Return MessageBulb.NotificationTypes.Wink Case "afk" - Return MessageBulb.NotifcationTypes.AFK + Return MessageBulb.NotificationTypes.AFK Case "/:(" - Return MessageBulb.NotifcationTypes.Angry + Return MessageBulb.NotificationTypes.Angry Case ":3" - Return MessageBulb.NotifcationTypes.CatFace + Return MessageBulb.NotificationTypes.CatFace Case ":/" - Return MessageBulb.NotifcationTypes.Unsure + Return MessageBulb.NotificationTypes.Unsure End Select - Return MessageBulb.NotifcationTypes.Waiting + Return MessageBulb.NotificationTypes.Waiting End Function Public Function Match(ByVal p As Pokemon) As Boolean diff --git a/P3D/Screens/MainMenu/NewNewGameScreen.vb b/P3D/Screens/MainMenu/NewNewGameScreen.vb index 027af237d..8f98f1d74 100644 --- a/P3D/Screens/MainMenu/NewNewGameScreen.vb +++ b/P3D/Screens/MainMenu/NewNewGameScreen.vb @@ -146,7 +146,7 @@ Core.Player.filePrefix = folderPath Core.Player.GameStart = Date.Now - + Core.Player.GameMode = GameModeManager.ActiveGameMode.Name Core.Player.startFOV = 60 Core.Player.startFreeCameraMode = True Core.Player.startPosition = New Vector3(x, y, z) diff --git a/P3D/World/ActionScript/V1/ScriptV1.vb b/P3D/World/ActionScript/V1/ScriptV1.vb index 2894dba04..3e3f16dce 100644 --- a/P3D/World/ActionScript/V1/ScriptV1.vb +++ b/P3D/World/ActionScript/V1/ScriptV1.vb @@ -919,30 +919,30 @@ Dim ID As Integer = CInt(Data(0)) Dim Position As New Vector3(CSng(Data(1).Replace(".", GameController.DecSeparator)), CSng(Data(2).Replace(".", GameController.DecSeparator)), CSng(Data(3).Replace(".", GameController.DecSeparator))) - Dim noType As MessageBulb.NotifcationTypes = MessageBulb.NotifcationTypes.Waiting + Dim noType As MessageBulb.NotificationTypes = MessageBulb.NotificationTypes.Waiting Select Case ID Case 0 - noType = MessageBulb.NotifcationTypes.Waiting + noType = MessageBulb.NotificationTypes.Waiting Case 1 - noType = MessageBulb.NotifcationTypes.Exclamation + noType = MessageBulb.NotificationTypes.Exclamation Case 2 - noType = MessageBulb.NotifcationTypes.Shouting + noType = MessageBulb.NotificationTypes.Shouting Case 3 - noType = MessageBulb.NotifcationTypes.Question + noType = MessageBulb.NotificationTypes.Question Case 4 - noType = MessageBulb.NotifcationTypes.Note + noType = MessageBulb.NotificationTypes.Note Case 5 - noType = MessageBulb.NotifcationTypes.Heart + noType = MessageBulb.NotificationTypes.Heart Case 6 - noType = MessageBulb.NotifcationTypes.Unhappy + noType = MessageBulb.NotificationTypes.Unhappy Case 7 - noType = MessageBulb.NotifcationTypes.Happy + noType = MessageBulb.NotificationTypes.Happy Case 8 - noType = MessageBulb.NotifcationTypes.Friendly + noType = MessageBulb.NotificationTypes.Friendly Case 9 - noType = MessageBulb.NotifcationTypes.Poisoned + noType = MessageBulb.NotificationTypes.Poisoned Case Else - noType = MessageBulb.NotifcationTypes.Exclamation + noType = MessageBulb.NotificationTypes.Exclamation End Select Screen.Level.Entities.Add(New MessageBulb(Position, noType)) diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoEntity.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoEntity.vb index a7cb2758e..129f5d202 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoEntity.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoEntity.vb @@ -25,12 +25,12 @@ Dim ID As Integer = int(Data(0)) Dim Position As New Vector3(sng(Data(1).Replace(".", GameController.DecSeparator)), sng(Data(2).Replace(".", GameController.DecSeparator)), sng(Data(3).Replace(".", GameController.DecSeparator))) - Dim noType As MessageBulb.NotifcationTypes = MessageBulb.NotifcationTypes.Waiting + Dim noType As MessageBulb.NotificationTypes = MessageBulb.NotificationTypes.Waiting Select Case ID Case 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 - noType = CType(ID, MessageBulb.NotifcationTypes) + noType = CType(ID, MessageBulb.NotificationTypes) Case Else - noType = MessageBulb.NotifcationTypes.Exclamation + noType = MessageBulb.NotificationTypes.Exclamation End Select Screen.Level.Entities.Add(New MessageBulb(Position, noType)) diff --git a/P3D/World/ActionScript/V2/ScriptLibrary.vb b/P3D/World/ActionScript/V2/ScriptLibrary.vb index 6d6b41f7e..5e5f1aedd 100644 --- a/P3D/World/ActionScript/V2/ScriptLibrary.vb +++ b/P3D/World/ActionScript/V2/ScriptLibrary.vb @@ -126,7 +126,7 @@ Namespace ScriptVersion2 r(New ScriptCommand("camera", "togglefix", "Sets the fix state of the camera to the opposite of the current state.")) r(New ScriptCommand("camera", "update", "Updates the camera.")) r(New ScriptCommand("camera", "setfocus", {New ScriptArgument("focusType", ScriptArgument.ArgumentTypes.Str, {"player", "npc", "entity"}), - New ScriptArgument("focusID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Focuses the camera on an object. ")) + New ScriptArgument("focusID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Focuses the camera on an object.")) r(New ScriptCommand("camera", "setfocustype", {New ScriptArgument("focusType", ScriptArgument.ArgumentTypes.Str, {"player", "npc", "entity"})}.ToList(), "Sets the focus type for the camera.")) r(New ScriptCommand("camera", "setfocusid", {New ScriptArgument("focusID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Sets the ID of the focus target for the camera.")) r(New ScriptCommand("camera", "settoplayerfacing", "Sets the Yaw of the camera to accommodate the player's facing.")) @@ -152,6 +152,7 @@ Namespace ScriptVersion2 ' Commands: r(New ScriptCommand("text", "show", {New ScriptArgument("text", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Displays a textbox with the given text.")) r(New ScriptCommand("text", "setfont", {New ScriptArgument("font", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Changes the font of the textbox. All fonts from loaded ContentPacks, GameModes and the standard game can be loaded.")) + r(New ScriptCommand("text", "notification", {New ScriptArgument("message", ScriptArgument.ArgumentTypes.Str), New ScriptArgument("delay", ScriptArgument.ArgumentTypes.Int, True, "500"), New ScriptArgument("backgroundindex", ScriptArgument.ArgumentTypes.Int, True, "0"), New ScriptArgument("iconindex", ScriptArgument.ArgumentTypes.Int, True, "0"), New ScriptArgument("soundeffect", ScriptArgument.ArgumentTypes.Str, True), New ScriptArgument("scriptfile", ScriptArgument.ArgumentTypes.Str, True)}.ToList(), "Displays a textbox with the given text.")) r(New ScriptCommand("text", "debug", {New ScriptArgument("text", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Prints the ""text"" argument to the immediate window console.")) r(New ScriptCommand("text", "log", {New ScriptArgument("text", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Logs the ""text"" argument into the log.dat file.")) End Sub @@ -227,11 +228,11 @@ Namespace ScriptVersion2 New ScriptArgument("x", ScriptArgument.ArgumentTypes.Sng), New ScriptArgument("y", ScriptArgument.ArgumentTypes.Sng), New ScriptArgument("z", ScriptArgument.ArgumentTypes.Sng)}.ToList(), "Warps the entity to a new location on the map.")) - r(New ScriptCommand("entity", "scale", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int), + r(New ScriptCommand("entity", "remove", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Removes the entity from the map once it updates.")) + r(New ScriptCommand("entity", "setscale", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("xS", ScriptArgument.ArgumentTypes.Sng), New ScriptArgument("yS", ScriptArgument.ArgumentTypes.Sng), New ScriptArgument("zS", ScriptArgument.ArgumentTypes.Sng)}.ToList(), "Changes the Scale property of the selected entity.")) - r(New ScriptCommand("entity", "remove", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Removes the entity from the map once it updates.")) r(New ScriptCommand("entity", "setid", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("newID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Sets the entity ID of the selected entity to a new ID.")) r(New ScriptCommand("entity", "setopacity", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int), @@ -242,7 +243,7 @@ Namespace ScriptVersion2 New ScriptArgument("additionalValue", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Sets the AdditionalValue property of the selected entity.")) r(New ScriptCommand("entity", "setcollision", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("collision", ScriptArgument.ArgumentTypes.Bool)}.ToList(), "Sets the Collision property of the selected entity.")) - r(New ScriptCommand("entity", "settetxure", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int), + r(New ScriptCommand("entity", "settexture", {New ScriptArgument("entityID", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("textureIndex", ScriptArgument.ArgumentTypes.Str), New ScriptArgument("textureName", ScriptArgument.ArgumentTypes.Str), New ScriptArgument("rX", ScriptArgument.ArgumentTypes.Int), @@ -268,7 +269,7 @@ Namespace ScriptVersion2 Private Shared Sub DoPhone() ' Constructs: - r(New ScriptCommand("phone", "callflag", "str", "Returns, if the Pokégear is calling or getting called. Values: ""calling"", ""receiving""", ",", True)) + r(New ScriptCommand("phone", "callflag", "str", "Returns if the Pokégear is calling or is being called. Values: ""calling"", ""receiving""", ",", True)) r(New ScriptCommand("phone", "got", "bool", "Returns if the player got the Pokégear.", ",", True)) End Sub