Skip to content

Commit

Permalink
ignore "" (empty-string) wings, pre-space count column in wing choose…
Browse files Browse the repository at this point in the history
…r table
  • Loading branch information
Trylobot committed Jul 7, 2017
1 parent 2edd04e commit 629d17d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sf-ship-ed-settings.json
ENG.ini
npm-debug.log*
desktop.ini
*.zip
8 changes: 7 additions & 1 deletion release/changes.log
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ ______________________________________________________________________________
editor version 2.7.3 (starsector 0.8.1a) [Trylobot]

FEATURES
- add/remove built-in wings from ships
- SHIP / BUILT-IN WINGS EDITING MODE ADDED
press "1" (ship mode), "D" (load), "N" (built-in wings submodule)

OTHER
- skeleton code / boilerplate necessary for Skin editing has been added,
but this mode doesn't do anything yet (so don't get too excited if you see it in the menus)
- heavy code maintenance / cleanup / refactoring

______________________________________________________________________________
editor version 2.7.2 (starsector 0.8.1a) [Trylobot]
Expand Down
1 change: 1 addition & 0 deletions src/TEditor.type.bmx
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ Type TEditor
Else
TCSVLoader.Load( dir+file, "id", stock_wing_stats )
EndIf
stock_wing_stats.Remove("") ' omit this, it is likely a spacer from the raw file data
Local row:TMap
For Local id$ = EachIn stock_wing_stats.Keys()
'scan all rows for multiselect values and save association to variant
Expand Down
2 changes: 1 addition & 1 deletion src/TModalSetBuiltInWings.type.bmx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Type TModalSetBuiltInWings Extends TSubroutine
'---------------------------------------------------------
' show how many of each wing are currently equipped to this ship
Local has_wings_count% = data.count_builtin_wings( wing_id )
Local has_wings_count_display$ = ""
Local has_wings_count_display$ = " "
If has_wings_count > 0
has_wings_count_display = "x" + has_wings_count
EndIf
Expand Down

0 comments on commit 629d17d

Please sign in to comment.