vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed LobbyScreen item grouping & light.hullsInRange updating

Browse Source
This commit is contained in:
Regalis
2016-01-02 16:40:24 +02:00
parent 325bf0c66b
commit 8717a2259f
8 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Screens/EditMapScreen.cs
+3 -1
View File
@@ -95,7 +95,6 @@ namespace Barotrauma
itemList.OnSelected = SelectPrefab;
itemList.CheckSelected = MapEntityPrefab.GetSelected;
foreach (MapEntityPrefab ep in MapEntityPrefab.list)
{
if (ep.Category != category) continue;
@@ -130,6 +129,9 @@ namespace Barotrauma
img.Color = ep.SpriteColor;
}
}
itemList.children.Sort((i1, i2) => (i1.UserData as MapEntityPrefab).Name.CompareTo((i2.UserData as MapEntityPrefab).Name));
}
Subsurface/Source/Screens/LobbyScreen.cs
+29 -16
View File
@@ -1,6 +1,7 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
using System.Linq;
using System.Collections.Generic;
using System.Globalization;
@@ -20,7 +21,7 @@ namespace Barotrauma
private GUIListBox characterList, hireList;
private GUIListBox selectedItemList;
private GUIListBox[] storeItemLists;
private GUIListBox storeItemList;
private SinglePlayerMode gameMode;
@@ -139,23 +140,23 @@ namespace Barotrauma
buyButton = new GUIButton(new Rectangle(sellColumnWidth + 20, 0, 100, 25), "Buy", Alignment.Bottom, GUI.Style, bottomPanel[(int)PanelTab.Store]);
buyButton.OnClicked = BuyItems;
storeItemLists = new GUIListBox[Enum.GetValues(typeof(MapEntityCategory)).Length];
int x = selectedItemList.Rect.Width + 40;
foreach (MapEntityCategory category in Enum.GetValues(typeof(MapEntityCategory)))
{
storeItemLists[(int)category] = new GUIListBox(new Rectangle(0, 0, sellColumnWidth, 400), Color.White * 0.7f, Alignment.TopRight, GUI.Style, bottomPanel[(int)PanelTab.Store]);
storeItemLists[(int)category].OnSelected = SelectItem;
storeItemLists[(int)category].UserData = category;
bottomPanel[(int)PanelTab.Store].RemoveChild(storeItemLists[(int)category]);
var items = MapEntityPrefab.list.FindAll(ep => ep.Price>0.0f && ep.Category == category);
if (!items.Any()) continue;
foreach (MapEntityPrefab ep in MapEntityPrefab.list)
{
if (ep.Price == 0 || ep.Category != category) continue;
var categoryButton = new GUIButton(new Rectangle(x, 0, 100, 20), category.ToString(), GUI.Style, bottomPanel[(int)PanelTab.Store]);
categoryButton.UserData = category;
categoryButton.OnClicked = SelectItemCategory;
x += 110;
CreateItemFrame(ep, storeItemLists[(int)category]);
}
storeItemList = new GUIListBox(new Rectangle(0, 30, sellColumnWidth, 400), Color.White * 0.7f, Alignment.TopRight, GUI.Style, bottomPanel[(int)PanelTab.Store]);
storeItemList.OnSelected = SelectItem;
storeItemList.UserData = category;
}
SelectItemCategory(null, MapEntityCategory.Item);
}
@@ -427,10 +428,22 @@ namespace Barotrauma
{
if (!(selection is MapEntityCategory)) return false;
var existingList = bottomPanel[(int)PanelTab.Store].children.Find(c => c.UserData is MapEntityCategory);
if (existingList != null) bottomPanel[(int)PanelTab.Store].RemoveChild(existingList);
//var existingList = bottomPanel[(int)PanelTab.Store].children.Find(c => c is GUIListBox && c.UserData is MapEntityCategory);
//if (existingList != null) bottomPanel[(int)PanelTab.Store].RemoveChild(existingList);
bottomPanel[(int)PanelTab.Store].AddChild(storeItemLists[(int)selection]);
//bottomPanel[(int)PanelTab.Store].AddChild(storeItemLists[(int)selection]);
storeItemList.ClearChildren();
MapEntityCategory category = (MapEntityCategory)selection;
var items = MapEntityPrefab.list.FindAll(ep => ep.Price > 0.0f && ep.Category == category);
foreach (MapEntityPrefab ep in items)
{
CreateItemFrame(ep, storeItemList);
}
storeItemList.children.Sort((x, y) => (x.UserData as MapEntityPrefab).Name.CompareTo((y.UserData as MapEntityPrefab).Name));
return true;
}