Merge branch 'master' of https://github.com/andrewknoll/FreeSO

Author: andrewknoll

.gitignore

@@ -84,3 +84,5 @@ TSOClient/tso.client/GlobalSettings1.Designer.cs
 *.DS_Store
 TSOClient/.vs/config/applicationhost.config
 *.nvuser
+
+TSOClient/Mario

TSOClient/FSO.IDE/EditorComponent/Primitives/RelationshipDescriptor.cs

@@ -54,6 +54,7 @@ public override string GetBody(EditorScope scope)
             string prepend = "";
             if (op.FailIfTooSmall) { flagStr.Append(prepend + "Fail if too small"); prepend = ","; }
             if (op.UseNeighbor) { flagStr.Append(prepend + "Use Neighbor"); prepend = ","; }
+            if (op.FSONeverPersist) { flagStr.Append(prepend + "Never Persist (FSO)"); prepend = ","; }
 
             if (flagStr.Length != 0)
             {
@@ -82,6 +83,7 @@ public override void PopulateOperandView(BHAVEditor master, EditorScope escope,
             panel.Controls.Add(new OpFlagsControl(master, escope, Operand, "Flags:", new OpFlag[] {
                 new OpFlag("Fail if too small", "FailIfTooSmall"),
                 new OpFlag("Use Neighbor", "UseNeighbor"),
+                new OpFlag("Never Persist (FSO)", "FSONeverPersist")
                 }));
 
             if (!old) panel.Controls.Add(new OpComboControl(master, escope, Operand, "Object in Local:", "Local", new OpStaticNamedPropertyProvider(escope.GetVarScopeDataNames(VMVariableScope.Local))));

TSOClient/FSO.Server.DataService/Model/Avatar.cs

@@ -208,11 +208,11 @@ public bool IsDefaultName
 
         #region FSO Data Service
 
-        private uint _Avatar_ModerationStatus;
-        public uint Avatar_ModerationStatus
+        private uint _Avatar_ModerationLevel;
+        public uint Avatar_ModerationLevel
         {
-            get { return _Avatar_ModerationStatus; }
-            set { _Avatar_ModerationStatus = value; NotifyPropertyChanged("Avatar_ModerationStatus"); }
+            get { return _Avatar_ModerationLevel; }
+            set { _Avatar_ModerationLevel = value; NotifyPropertyChanged("Avatar_ModerationLevel"); }
         }
 
         private uint _Avatar_MayorNhood;

TSOClient/FSO.Server/DataService/Providers/ServerAvatarProvider.cs

@@ -334,7 +334,7 @@ private Avatar HydrateOne(DbAvatar dbAvatar, DbLot dbLot)
             };
             result.Avatar_PrivacyMode = dbAvatar.privacy_mode;
             result.Avatar_SkillsLockPoints = (ushort)(20 + result.Avatar_Age/7);
-            result.Avatar_ModerationStatus = dbAvatar.moderation_level;
+            result.Avatar_ModerationLevel = dbAvatar.moderation_level;
             result.Avatar_MayorNhood = (uint)(dbAvatar.mayor_nhood ?? 0);
 
             result.JobLevelProvider = JobLevelProvider;

TSOClient/FSO.Server/Servers/Lot/Domain/LotContainer.cs

@@ -108,7 +108,7 @@ public class LotContainer
             0x475CC813, //water balloon controller
             0x2D583771, //winter weather controller
             0x7A78195C, //snowball controller
-            0x33AD8F84, //face mask controller
+            0x063F2ABE, //global accessory controller
             0x04AB1D1F, //zombie spawner controller
             0x0DF8592E, //mini sims
             0x48F32C7B, //au game controller
@@ -202,13 +202,37 @@ public LotContainer(IDAFactory da, LotContext context, ILotHost host, IKernel ke
         public void GenerateTerrain()
         {
             Terrain = new VMTSOSurroundingTerrain();
+
             var coords = MapCoordinates.Unpack(LotPersist.location);
             var map = Realestate.GetMap();
-            for (int y = 0; y < 3; y++)
+
+            if (LotPersist.location >= 0x10200 && LotPersist.location < 0x20000)
             {
-                for (int x = 0; x < 3; x++)
+                // Special off-world property. Currently these are all islands.
+                for (int y = 0; y < 3; y++)
+                {
+                    for (int x = 0; x < 3; x++)
+                    {
+                        var baseType = (x == 1 && y == 1) ? Content.Model.TerrainType.SAND : Content.Model.TerrainType.WATER;
+
+                        Terrain.BlendN[x, y] = new Content.Model.TerrainBlend()
+                        {
+                            Base = baseType,
+                            Blend = baseType,
+                            AdjFlags = 0,
+                            WaterFlags = 0
+                        };
+                    }
+                }
+            }
+            else
+            {
+                for (int y = 0; y < 3; y++)
                 {
-                    Terrain.BlendN[x, y] = map.GetBlend((coords.X-1)+x, (coords.Y-1)+y);
+                    for (int x = 0; x < 3; x++)
+                    {
+                        Terrain.BlendN[x, y] = map.GetBlend((coords.X - 1) + x, (coords.Y - 1) + y);
+                    }
                 }
             }
 
@@ -440,7 +464,10 @@ private void ReturnOOWObjects()
         {
             //we can delete these without respecting slot rules because of how SLOTs work (deleting table under us will move us to OOW)
 
-            var ents = Lot.Entities.Where(x => x.Position == LotView.Model.LotTilePos.OUT_OF_WORLD && !ValidOOWGUIDs.Contains(x.Object.OBJ.GUID)).ToList();
+            var ents = Lot.Entities.Where(x => 
+                x.Position == LotView.Model.LotTilePos.OUT_OF_WORLD &&
+                (!(x is VMGameObject) || !((VMGameObject)x).Disabled.HasFlag(VMGameObjectDisableFlags.Transient)) &&
+                !ValidOOWGUIDs.Contains(x.Object.OBJ.GUID)).ToList();
             ents.AddRange(Lot.Entities.Where(x => x.MultitileGroup.Objects.Any(y => InvalidGUIDs.Contains(y.Object.OBJ.GUID))));
 
             foreach (var ent in ents)
@@ -752,6 +779,7 @@ public void ResetVM()
                 {
                     Tuning = Tuning
                 });
+                Lot.Tick();
             }
 
             Lot.Context.UpdateTSOBuildableArea();

TSOClient/tso.client/Rendering/City/CityGeometry.cs

@@ -468,11 +468,14 @@ public void RegenMeshVerts(GraphicsDevice gd, Rectangle? range)
 
             RoadIndices?.Dispose();
             RoadVertices?.Dispose();
-            RoadIndices = new IndexBuffer(gd, IndexElementSize.ThirtyTwoBits, roadIndices.Count, BufferUsage.None);
-            RoadIndices.SetData(roadIndices.ToArray());
-            RoadVertices = new VertexBuffer(gd, typeof(TLayerVertex), roadVertices.Count, BufferUsage.None);
-            RoadVertices.SetData(roadVertices.ToArray());
-            RoadPrims = roadIndices.Count / 3;
+            if (roadVertices.Count > 0)
+            {
+                RoadIndices = new IndexBuffer(gd, IndexElementSize.ThirtyTwoBits, roadIndices.Count, BufferUsage.None);
+                RoadIndices.SetData(roadIndices.ToArray());
+                RoadVertices = new VertexBuffer(gd, typeof(TLayerVertex), roadVertices.Count, BufferUsage.None);
+                RoadVertices.SetData(roadVertices.ToArray());
+                RoadPrims = roadIndices.Count / 3;
+            }
         }
 
         private int O(int x, int y, int minx, int maxx)

TSOClient/tso.client/Rendering/City/CityMapData.cs

@@ -83,6 +83,10 @@ public void Load(string baseDir, Func<string, Texture2D> texLoader, string filet
             roadMap.Dispose();
         }
 
+        public bool IsInBounds(int x, int y)
+        {
+            return x > -0 && x < 512 && y >= 0 && y < 512;
+        }
 
         private Tuple<int, int> InBounds(int x, int y)
         {

TSOClient/tso.client/Rendering/City/Terrain.cs

@@ -794,6 +794,9 @@ private void Draw3DHouses(int passIndex)
 
                     short x = lots[i].x;
                     short y = lots[i].y;
+
+                    if (!MapData.IsInBounds(x, y)) continue;
+
                     var pos = new Vector3(x + 0.5f, MapData.ElevationData[(y * 512 + x)] / 12.0f, y + 0.5f);
                     verts.Add(new DGRP3DVert(pos, Vector3.Up, new Vector2()));
                     verts.Add(new DGRP3DVert(pos, Vector3.Up, new Vector2(1, 0)));

TSOClient/tso.client/UI/Controls/UILotButton.cs

@@ -271,7 +271,11 @@ public override void Draw(UISpriteBatch batch)
             {
                 var terrain = ((CoreGameScreen)GameFacade.Screens.CurrentUIScreen).CityRenderer;
                 var Size = new Vector2(80, 50);
-                Vector2 startVec = new Vector2(40, 25) + Position, end = UITerrainHighlight.GetEndpointFromLotId(terrain, startVec, (int)LotId);
+                Vector2 startVec = new Vector2(40, 25) + Position;
+                Vector2? dest = UITerrainHighlight.GetEndpointFromLotId(terrain, startVec, (int)LotId);
+                if (!dest.HasValue) return;
+
+                Vector2 end = dest.Value;
                 Vector2 start = end;
 
                 // position line around border

TSOClient/tso.client/UI/Controls/UIMapWaypoint.cs

@@ -282,7 +282,11 @@ public override void Draw(UISpriteBatch batch)
         {
             if (!Visible) return;
             var terrain = ((CoreGameScreen)GameFacade.Screens.CurrentUIScreen).CityRenderer;
-            Vector2 startVec = (new Vector2(60 / 2, 60 / 2) + Position), end = UITerrainHighlight.GetEndpointFromLotId(terrain, startVec, (int)LotId) / FSOEnvironment.DPIScaleFactor;
+            Vector2 startVec = (new Vector2(60 / 2, 60 / 2) + Position);
+            Vector2? dest = UITerrainHighlight.GetEndpointFromLotId(terrain, startVec, (int)LotId);
+            if (!dest.HasValue) return;
+
+            Vector2 end = dest.Value / FSOEnvironment.DPIScaleFactor;
             Vector2 start = end;
 
             //position line around border all pretty like

TSOClient/tso.client/UI/Panels/UILiveMode.cs

@@ -163,6 +163,8 @@ public UILiveMode (UILotControl lotController) {
             DynamicOverlay.Add(MotiveDisplay);
 
             PersonGrid = new UIPersonGrid(LotController.vm);
+            PersonGrid.NextPageButton = NextPageButton;
+            PersonGrid.PreviousPageButton = PreviousPageButton;
             Add(PersonGrid);
             PersonGrid.Position = new Vector2(409, 51);
             if (Small800) {

TSOClient/tso.client/UI/Panels/UILotControl.cs

@@ -680,7 +680,7 @@ public void LiveModeUpdate(UpdateState state, bool scrolled)
                             var obj = vm.GetObjectById(ObjectHover);
                             if (obj is VMAvatar)
                             {
-                                cursor = (((VMAvatar)obj).GetPersonData(VMPersonDataVariable.PersonType) != 255) ? CursorType.LivePerson : CursorType.LiveObjectAvail;
+                                cursor = (((VMAvatar)obj).GetPersonData(VMPersonDataVariable.PersonType) < 254) ? CursorType.LivePerson : CursorType.LiveObjectAvail;
                             }
                             else
                             {
@@ -709,7 +709,10 @@ private string GetAvatarString(VMAvatar ava)
         {
             int prefixNum = 3;
             string prefixSrc = "217";
-            if (ava.IsPet) prefixNum = 5;
+            var personType = ava.GetPersonData(VMPersonDataVariable.PersonType);
+
+            if (personType >= 254) return ava.ToString();
+            else if (ava.IsPet) prefixNum = 5;
             else if (ava.PersistID == 0) prefixNum = 4;
             else
             {

TSOClient/tso.client/UI/Panels/UILotPage.cs

@@ -423,7 +423,8 @@ private void RefreshUI()
                 }
             }
 
-            var canJoin = isMyProperty || isRoommate || isOnline || GameFacade.EnableMod || isCommunity;
+            bool inBounds = CurrentLot.Value == null || CurrentLot.Value.Lot_Location_Packed < 0x10200 || CurrentLot.Value.Lot_Location_Packed >= 0x20000;
+            var canJoin = isMyProperty || isRoommate || (inBounds && (isOnline || isCommunity)) || GameFacade.EnableMod;
 
             HouseNameButton.Disabled = !isMyProperty;
 

TSOClient/tso.client/UI/Panels/UIPersonGrid.cs

@@ -30,6 +30,10 @@ public UIPersonGrid(VM vm)
             UpdatePeople();
         }
 
+
+        public UIButton NextPageButton { get; set; }
+        public UIButton PreviousPageButton { get; set; }
+
         public void UpdatePeople()
         {
             bool change = false;
@@ -46,7 +50,7 @@ public void UpdatePeople()
 
             foreach (var sim in vm.Context.ObjectQueries.Avatars)
             {
-                if (!Display.Contains(sim) && sim.PersistID != vm.MyUID && (sim as VMAvatar)?.GetPersonData(SimAntics.Model.VMPersonDataVariable.PersonType) != 255)
+                if (!Display.Contains(sim) && sim.PersistID != vm.MyUID && (sim as VMAvatar)?.GetPersonData(SimAntics.Model.VMPersonDataVariable.PersonType) < 254)
                 {
                     Display.Add((VMAvatar)sim);
                     change = true;
@@ -61,10 +65,23 @@ public void UpdatePeople()
             }
         }
 
+        private void UpdateButtons()
+        {
+            if (PreviousPageButton != null)
+            {
+                PreviousPageButton.Disabled = Page == 0;
+            }
+            if (NextPageButton != null)
+            {
+                NextPageButton.Disabled = Page == NumPages - 1;
+            }
+        }
+
         public override void Update(UpdateState state)
         {
             base.Update(state);
             UpdatePeople();
+            UpdateButtons();
         }
 
         public void DrawPage()
@@ -101,5 +118,13 @@ public void PreviousPage()
             Page--;
             DrawPage();
         }
+
+        public int NumPages
+        {
+            get
+            {
+                return ((Display.Count - 1) / (Columns * Rows)) + 1;
+            }
+        }
     }
 }

TSOClient/tso.client/UI/Panels/UIPersonPage.cs

@@ -25,6 +25,8 @@ public class UIPersonPage : UIContainer
         public UIImage BackgroundExpandedImage { get; set; }
         public UIImage BackgroundNameImage { get; set; }
         public UISim SimBox { get; set; }
+        public UIButton ProfileBadge { get; private set; } // FounderButton   
+        private Texture2D FounderButtonTexture;
 
         /** Auto wired **/
         public UIButton ExpandButton { get; set; }
@@ -276,6 +278,9 @@ public UIPersonPage()
             Add(OptionsBackgroundImage);
 
             var ui = this.RenderScript("personpage.uis");
+            ProfileBadge = this.Children.Find(x => x.ID == "FounderButton") as UIButton;
+            FounderButtonTexture = ProfileBadge.Texture; // grab the original texture in case the badge has to be reset while a profile page is open
+
 
             MechanicalSkillBar = ui.Create<UISkillBar>("MechanicalSkillBarArea");
             CookingSkillBar = ui.Create<UISkillBar>("CookingSkillBarArea");
@@ -323,7 +328,7 @@ public UIPersonPage()
                         screen.vm.SendCommand(new VMNetSkillLockCmd()
                         {
                             SkillID = VMSkillMap[bar.SkillID],
-                            LockLevel = (byte)bar.LockLevel
+                            LockLevel = (short)bar.LockLevel
                         });
                     }
 
@@ -464,7 +469,7 @@ public UIPersonPage()
                 .WithMultiBinding(x =>
                 {
                     Redraw();
-                }, "Avatar_Name", "Avatar_IsOnline", "Avatar_Description", "Avatar_PrivacyMode");
+                }, "Avatar_Name", "Avatar_IsOnline", "Avatar_Description", "Avatar_PrivacyMode", "Avatar_ModerationLevel");
 
             MyAvatar = new Binding<Avatar>()
                 .WithMultiBinding(x =>
@@ -931,6 +936,21 @@ private void Redraw()
                 isMe = FindController<CoreGameScreenController>().IsMe(CurrentAvatar.Value.Avatar_Id);
                 hasProperty = CurrentAvatar.Value.Avatar_LotGridXY != 0;
 
+                if (CurrentAvatar.Value.Avatar_ModerationLevel != 0)
+                {
+                    ProfileBadge.Texture = Content.Content.Get().CustomUI.Get("momi_badge.png").Get(GameFacade.GraphicsDevice);
+                    ProfileBadge.ScaleX = 1f;
+                    ProfileBadge.ScaleY = 1f;
+                    ProfileBadge.Tooltip = "Staff";
+                }
+                else
+                {
+                    ProfileBadge.Texture = FounderButtonTexture;
+                    ProfileBadge.Tooltip = "Founder";
+                    ProfileBadge.ScaleX = 1f;
+                    ProfileBadge.ScaleY = 1f;
+                }
+
                 if (OriginalDescription != CurrentAvatar.Value.Avatar_Description)
                 {
                     OriginalDescription = CurrentAvatar.Value.Avatar_Description;

TSOClient/tso.client/UI/Panels/UIPieMenu.cs

@@ -77,7 +77,8 @@ public UIPieMenu(List<VMPieMenuInteraction> pie, VMEntity obj, VMEntity caller,
 
             lerpSpeed = 0.125f * (60.0f / FSOEnvironment.RefreshRate);
             m_Bg = new UIImage(TextureGenerator.GetPieBG(GameFacade.GraphicsDevice));
-            m_Bg.SetSize(0, 0); //is scaled up later
+            m_Bg.SetSize(2, 2); //is scaled up later
+            m_Bg.Position = new Vector2(-1, -1);
             this.AddAt(0, m_Bg);
 
             m_PieTree = new UIPieMenuItem()