commit for v0.10.4

Author: dertseha

src/github.com/inkyblackness/res/data/levelobj/Barriers.go

@@ -8,7 +8,10 @@ import (
 
 var baseBarrier = interpreters.New().
 	With("LockVariableIndex", 0, 2).As(interpreters.RangedValue(0, 0x1FF)).
-	With("LockMessageIndex", 2, 1).
+	With("LockMessageIndex", 2, 1).As(interpreters.FormattedRangedValue(0, 255,
+	func(value int64) (result string) {
+		return fmt.Sprintf("%d", value+7)
+	})).
 	With("ForceDoorColor", 3, 1).As(interpreters.FormattedRangedValue(0, 255,
 	func(value int64) (result string) {
 		if colorText, defined := forceColors[value]; defined {
@@ -18,9 +21,11 @@ var baseBarrier = interpreters.New().
 		}
 		return result
 	})).
-	With("RequiredAccessLevel", 4, 1).As(interpreters.FormattedRangedValue(0, 30,
+	With("RequiredAccessLevel", 4, 1).As(interpreters.FormattedRangedValue(0, 255,
 	func(value int64) (result string) {
-		if accessLevel, known := accessLevelMasks[1<<uint32(value)]; known {
+		if value == 255 {
+			result = fmt.Sprintf("SHODAN - raw: 255")
+		} else if accessLevel, known := accessLevelMasks[1<<uint32(value)]; known {
 			result = fmt.Sprintf("%s  - raw: %d", accessLevel, value)
 		} else {
 			result = fmt.Sprintf("Unknown  - raw: %d", value)

src/github.com/inkyblackness/shocked-client/editor/modes/GameTextsMode.go

@@ -94,6 +94,7 @@ func NewGameTextsMode(context Context, parent *ui.Area) *GameTextsMode {
 				&enumItem{uint32(dataModel.ResourceTypeTrapMessages), "Trap Messages"},
 				&enumItem{uint32(dataModel.ResourceTypeWords), "Words"},
 				&enumItem{uint32(dataModel.ResourceTypeLogCategories), "Log Categories"},
+				&enumItem{uint32(dataModel.ResourceTypeVariousMessages), "Various Messages"},
 				&enumItem{uint32(dataModel.ResourceTypeScreenMessages), "Screen Messages"},
 				&enumItem{uint32(dataModel.ResourceTypeInfoNodeMessages), "Info Node Messages (8/5/6)"},
 				&enumItem{uint32(dataModel.ResourceTypeAccessCardNames), "Access Card Names"},

src/github.com/inkyblackness/shocked-core/Texts.go

@@ -19,6 +19,7 @@ var knownTexts = map[model.ResourceType]textInfo{
 	model.ResourceTypeTrapMessages:     {false, model.MaxTrapMessages},
 	model.ResourceTypeWords:            {false, model.MaxWords},
 	model.ResourceTypeLogCategories:    {false, model.MaxLogCategories},
+	model.ResourceTypeVariousMessages:  {false, model.MaxVariousMessages},
 	model.ResourceTypeScreenMessages:   {false, model.MaxScreenMessages},
 	model.ResourceTypeInfoNodeMessages: {false, model.MaxInfoNodeMessages},
 	model.ResourceTypeAccessCardNames:  {false, model.MaxAccessCardNames},

src/github.com/inkyblackness/shocked-model/Limits.go

@@ -5,6 +5,7 @@ const (
 	MaxTrapMessages     = 512
 	MaxWords            = 512
 	MaxLogCategories    = 16
+	MaxVariousMessages  = 256
 	MaxScreenMessages   = 120
 	MaxInfoNodeMessages = 256
 	MaxAccessCardNames  = 32 * 2
@@ -16,6 +17,7 @@ var maxEntriesByType = map[ResourceType]int{
 	ResourceTypeTrapMessages:     MaxTrapMessages,
 	ResourceTypeWords:            MaxWords,
 	ResourceTypeLogCategories:    MaxLogCategories,
+	ResourceTypeVariousMessages:  MaxVariousMessages,
 	ResourceTypeScreenMessages:   MaxScreenMessages,
 	ResourceTypeInfoNodeMessages: MaxInfoNodeMessages,
 	ResourceTypeAccessCardNames:  MaxAccessCardNames,

src/github.com/inkyblackness/shocked-model/ResourceType.go

@@ -13,6 +13,8 @@ const (
 	ResourceTypeWords = ResourceType(0x0868)
 	// ResourceTypeLogCategories contains the category names of logs.
 	ResourceTypeLogCategories = ResourceType(0x0870)
+	// ResourceTypeVariousMessages contains all sorts of messages, including door lock messages.
+	ResourceTypeVariousMessages = ResourceType(0x0871)
 	// ResourceTypeScreenMessages contains the messages shown on screens.
 	ResourceTypeScreenMessages = ResourceType(0x0877)
 	// ResourceTypeInfoNodeMessages contains the short text fragments found in cyberspace of 8/5/6 nodes.