thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prefab changes

Browse Source
This commit is contained in:
anton.gurov 2019-11-13 10:58:30 +03:00
parent 6197e3be8e
commit 6353bd7ce3
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -20,8 +20,8 @@ all: build test
build: distclean build.deps build.game build: distclean build.deps build.game
# build.game: build.game.linux64 build.game.win64 build.game.mac build.game: build.game.linux64 build.game.win64 build.game.mac
build.game: build.game.linux64 build.game.win64 # build.game: build.game.linux64 build.game.win64
build.deps: build.deps:
GIT_SSL_NO_VERIFY=true $(GO) mod vendor GIT_SSL_NO_VERIFY=true $(GO) mod vendor
@ -45,11 +45,14 @@ build.game.win64:
/usr/bin/x86_64-w64-mingw32-strip $(DISTFOLDER)/game.exe && \ /usr/bin/x86_64-w64-mingw32-strip $(DISTFOLDER)/game.exe && \
cd $(DISTFOLDER) && zip -r ../$(PROJECT_NAME)-$(OS)-${PKG_VER}.zip . -x *.git* cd $(DISTFOLDER) && zip -r ../$(PROJECT_NAME)-$(OS)-${PKG_VER}.zip . -x *.git*
# OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 MACOSX_DEPLOYMENT_TARGET=10.6 CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 $(GO) build -ldflags $(LDFLAGS) -o $(DISTFOLDER)/game $(CWD)/cmd/game/main.go &&
build.game.mac: build.game.mac:
cp $(CWD)/lib/mac/libBearLibTerminal.dylib $(DISTFOLDER) && \ cp $(CWD)/lib/mac/libBearLibTerminal.dylib $(DISTFOLDER) && \
cp $(CWD)/config.json $(DISTFOLDER) && \ cp $(CWD)/config.json $(DISTFOLDER) && \
cp -r $(CWD)/assets $(DISTFOLDER) && \ cp -r $(CWD)/assets $(DISTFOLDER) && \
OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 MACOSX_DEPLOYMENT_TARGET=10.6 CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 $(GO) build -ldflags $(LDFLAGS) -o $(DISTFOLDER)/game $(CWD)/cmd/game/main.go && \ OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 MACOSX_DEPLOYMENT_TARGET=10.6 CC=clang CXX=clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 $(GO) build -ldflags $(LDFLAGS) -o $(DISTFOLDER)/game $(CWD)/cmd/game/main.go && \
strip $(DISTFOLDER)/game.exe && \ strip $(DISTFOLDER)/game.exe && \
cd $(DISTFOLDER) && zip -r ../$(PROJECT_NAME)-$(OS)-${PKG_VER}.zip . -x *.git* cd $(DISTFOLDER) && zip -r ../$(PROJECT_NAME)-$(OS)-${PKG_VER}.zip . -x *.git*

2
config.json
View File

@ -1,5 +1,5 @@
{ {
"version": "v0.0.1.5-1-gbecf7ea", "version": "v0.0.1.6",
"title": "Alchemyst", "title": "Alchemyst",
"sizeX": 100, "sizeX": 100,
"sizeY": 47, "sizeY": 47,

3
engine/gamemap/prefab.go
View File

@ -103,10 +103,11 @@ func (pfbl PrefabLoader) PrefabRoomsList() []Room {
room.Connectors = append(room.Connectors, types.Coords{i, j}) room.Connectors = append(room.Connectors, types.Coords{i, j})
} else { } else {
f, ok = TileTypeMap[shortName] f, ok = TileTypeMap[shortName]
}
if (!ok) { if (!ok) {
pfbl.ctx.Logger().Warn().Msgf("Unknown tile: %s", shortName) pfbl.ctx.Logger().Warn().Msgf("Unknown tile: %s", shortName)
} }
}
room.Geometry[i+j*room.W] = f room.Geometry[i+j*room.W] = f
} }
} }

2
go.mod
View File

@ -4,7 +4,7 @@ go 1.12
require ( require (
github.com/gammazero/deque v0.0.0-20190521012701-46e4ffb7a622 github.com/gammazero/deque v0.0.0-20190521012701-46e4ffb7a622
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
github.com/rs/zerolog v1.15.0 github.com/rs/zerolog v1.15.0
lab.zaar.be/thefish/bearlibterminal v0.0.0-20191018101635-dd37bbc90d77 lab.zaar.be/thefish/bearlibterminal v0.0.0-20191018101635-dd37bbc90d77
) )