SVI Переделка на новую архитектуру

Makefile

@@ -9,7 +9,8 @@ build:
 	cp -r ./web ./bin
 	# cp ./util/store.so ./bin/store.so
 	go fmt ./...
-	go build -ldflags "-w -s -X main.GoVersion=$(GO_VERS) -X main.Version=${TAG} -X main.Date=${BUILD_DATE}" -o ./bin/server ./cmd/server/main.go
+	# go build -ldflags "-w -s -X main.GoVersion=$(GO_VERS) -X main.Version=${TAG} -X main.Date=${BUILD_DATE}" -o ./bin/server ./cmd/server/main.go
+	go build -o ./bin/server ./cmd/server/main.go
 	strip -s ./bin/server
 	upx -f ./bin/server
 prod2:
@@ -30,7 +31,8 @@ dev:
 	cp -r ./web ./bin_dev
 	go fmt ./...
 	# go build -race -o ./bin_dev/wartank_dev ./cmd/server/main.go
-	go build -ldflags "-w -s -X main.GoVersion=$(GO_VERS) -X main.Version=${TAG} -X main.Date=${BUILD_DATE}" -o ./bin_dev/wartank_dev ./cmd/server/main.go
+	# go build -ldflags "-w -s -X main.GoVersion=$(GO_VERS) -X main.Version=${TAG} -X main.Date=${BUILD_DATE}" -o ./bin_dev/wartank_dev ./cmd/server/main.go
+	go build -race -o ./bin_dev/wartank_dev ./cmd/server/main.go
 	./run_dev.sh
 prod:
 	clear
@@ -46,7 +48,7 @@ test:
 mod:
 	clear
 	go get -u ./...
-	go mod tidy -compat=1.23.6
+	go mod tidy -compat=1.24.0
 	go mod vendor
 	go fmt ./...
 lint:

app/app.go

@@ -0,0 +1,2 @@
+// package app -- главный тип приложения
+package app

server/lev0/types/iserver.go → app/lev0/types/iapp.go

@@ -7,7 +7,7 @@ import "wartank/pkg/kernel/kernel_types"
 */
 
 // ИСервер -- интерфейс для приложения
-type ИСервер interface {
+type ИПриложение interface {
 	kernel_types.ИЯдроКонтекст
 	// Пуск -- запускает приложение в работу
 	Пуск() error

server/lev0/types/iangar.go → app/lev0/types/iarena_angar.go

@@ -7,6 +7,7 @@ package types
 // ИАнгар -- интерфейс ангара
 type ИАнгар interface {
 	ИСценаСтр
+	ИАрена
 	// Конвой -- возвращает объект конвоя
 	Конвой() ИАренаКонвой
 	// Золото -- возвращает объект золота

server/lev0/types/ibot.go → app/lev0/types/ibot.go

@@ -2,7 +2,7 @@ package types
 
 import (
 	"context"
-	. "wartank/server/lev0/alias"
+	. "wartank/app/lev0/alias"
 )
 
 // ИБот -- серверный бот с реальным состоянием
@@ -30,7 +30,7 @@ type ИБот interface {
 	// ЕслиПуск -- признак, что бот работает
 	ЕслиПуск() bool
 	// Сервер -- возвращает ссылку на объект сервера
-	Сервер() ИСервер
+	Сервер() ИПриложение
 	// Контекст -- возвращает контекст бота
 	Контекст() context.Context
 	// Закончить -- отменяет контекст бота

server/lev0/types/iserv_bots.go → app/lev0/types/iserv_bots.go

@@ -1,7 +1,7 @@
 package types
 
 import (
-	. "wartank/server/lev0/alias"
+	. "wartank/app/lev0/alias"
 )
 
 // ИБотоФерма -- словарь серверных ботов

server/lev1/web_render/web_render.go → app/lev1/web_render/web_render.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"strings"
 
+	. "wartank/app/lev0/types"
 	"wartank/pkg/kernel/kernel_log"
-	. "wartank/server/lev0/types"
 )
 
 // ВебРендер -- простой веб-рендер

server/lev2/serv_bots/dict_warbot/dict_warbot.go → app/lev2/serv_bots/dict_warbot/dict_warbot.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 	"sync"
 
+	. "wartank/app/lev0/alias"
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot"
 	"wartank/pkg/kernel/kernel_log"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/alias"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot"
 )
 
 const (
@@ -21,7 +21,7 @@ const (
 // СловарьБотов -- потокобезопасный словарь ботов
 type СловарьБотов struct {
 	конт    ИЯдроКонтекст
-	сервер  ИСервер
+	сервер  ИПриложение
 	хран    IKernelStore
 	словарь map[АБотНомер]ИБот
 	блок    sync.RWMutex
@@ -29,7 +29,7 @@ type СловарьБотов struct {
 }
 
 // НовСловарьБотов -- возвращает новый потокобезопасный словарь ботов
-func НовСловарьБотов(конт ИЯдроКонтекст, сервер ИСервер) *СловарьБотов {
+func НовСловарьБотов(конт ИЯдроКонтекст, сервер ИПриложение) *СловарьБотов {
 	лог := kernel_log.НовЛоггер("СловарьБотов")
 	лог.Инфо("НовСловарьБотов()\n")
 	лог.Паника(сервер == nil, "НовСловарьБотов(): ИСервер==nil")

server/lev2/serv_bots/serv_bots.go → app/lev2/serv_bots/serv_bots.go

@@ -5,16 +5,16 @@ import (
 	"fmt"
 	"log"
 
+	. "wartank/app/lev0/alias"
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/dict_warbot"
+	"wartank/app/lev2/serv_bots/warbot"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/alias"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/dict_warbot"
-	"wartank/server/lev2/serv_bots/warbot"
 )
 
 // БотоФерма -- словарь ботов на сервере
 type БотоФерма struct {
-	серв    ИСервер
+	серв    ИПриложение
 	хран    IKernelStore
 	словБот *dict_warbot.СловарьБотов
 }
@@ -22,7 +22,7 @@ type БотоФерма struct {
 // НовБотоФерма -- возвращает новый словарь серверных ботов
 func НовБотоФерма(конт ИЯдроКонтекст) *БотоФерма {
 	log.Println("НовБотоФерма()")
-	серв := конт.Получ("сервер").(ИСервер)
+	серв := конт.Получ("сервер").(ИПриложение)
 	сам := &БотоФерма{
 		серв: серв,
 		хран: серв.Получ("kernStore").(IKernelStore),

server/lev2/serv_bots/warbot/angar/angar.go → app/lev2/serv_bots/warbot/angar/angar.go

@@ -7,20 +7,20 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/base"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle"
+	"wartank/app/lev2/serv_bots/warbot/angar/bot_net_stat"
+	"wartank/app/lev2/serv_bots/warbot/angar/convoy"
+	"wartank/app/lev2/serv_bots/warbot/angar/fuel_attack"
+	"wartank/app/lev2/serv_bots/warbot/angar/masters"
+	"wartank/app/lev2/serv_bots/warbot/angar/missions"
+	"wartank/app/lev2/serv_bots/warbot/angar/tank_params"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_resurs"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/base"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle"
-	"wartank/server/lev2/serv_bots/warbot/angar/bot_net_stat"
-	"wartank/server/lev2/serv_bots/warbot/angar/convoy"
-	"wartank/server/lev2/serv_bots/warbot/angar/fuel_attack"
-	"wartank/server/lev2/serv_bots/warbot/angar/masters"
-	"wartank/server/lev2/serv_bots/warbot/angar/missions"
-	"wartank/server/lev2/serv_bots/warbot/angar/tank_params"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_resurs"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/base/arsenal/arsenal.go → app/lev2/serv_bots/warbot/angar/base/arsenal/arsenal.go

@@ -9,13 +9,13 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
 	"wartank/pkg/components/web_log"
 	"wartank/pkg/kernel/kernel_log"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 const (

server/lev2/serv_bots/warbot/angar/base/bank/bank.go → app/lev2/serv_bots/warbot/angar/base/bank/bank.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/bank/bank_mode"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/bank/bank_mode"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/base/bank/bank_mode/bank_mode.go → app/lev2/serv_bots/warbot/angar/base/bank/bank_mode/bank_mode.go

@@ -1,8 +1,8 @@
 package bank_mode
 
 import (
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/base/base.go → app/lev2/serv_bots/warbot/angar/base/base.go

@@ -9,18 +9,18 @@ import (
 	"sync"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/arsenal"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/bank"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/fuel"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/labor"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/market"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/mine"
+	"wartank/app/lev2/serv_bots/warbot/angar/base/polygon"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
 	"wartank/pkg/cons"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/arsenal"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/bank"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/fuel"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/labor"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/market"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/mine"
-	"wartank/server/lev2/serv_bots/warbot/angar/base/polygon"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/base/fuel/fuel.go → app/lev2/serv_bots/warbot/angar/base/fuel/fuel.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 // СкладТоплива -- склад топлива

server/lev2/serv_bots/warbot/angar/base/labor/labor.go → app/lev2/serv_bots/warbot/angar/base/labor/labor.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 	"time"
-	. "wartank/server/lev0/types"
+	. "wartank/app/lev0/types"
 )
 
 // Лаборатория на базе

server/lev2/serv_bots/warbot/angar/base/market/market.go → app/lev2/serv_bots/warbot/angar/base/market/market.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 // Рынок -- объект рынка

server/lev2/serv_bots/warbot/angar/base/mine/mine.go → app/lev2/serv_bots/warbot/angar/base/mine/mine.go

@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 // Шахта -- объект шахты на базе

server/lev2/serv_bots/warbot/angar/base/polygon/polygon.go → app/lev2/serv_bots/warbot/angar/base/polygon/polygon.go

@@ -6,6 +6,8 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
@@ -14,8 +16,6 @@ import (
 	. "wartank/pkg/kernel/kernel_types"
 	"wartank/pkg/kernel/safe_int"
 	"wartank/pkg/kernel/safe_string"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/battle/battle.go → app/lev2/serv_bots/warbot/angar/battle/battle.go

@@ -4,11 +4,11 @@ package battle
 import (
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_register"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_wait"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker"
 	"wartank/pkg/arena"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_register"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_wait"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker"
 )
 
 // Сражение -- объект сражения

server/lev2/serv_bots/warbot/angar/battle/battle_net/battle_net.go → app/lev2/serv_bots/warbot/angar/battle/battle_net/battle_net.go

@@ -1,9 +1,9 @@
 package battle_net
 
 import (
+	. "wartank/app/lev0/types"
 	"wartank/pkg/components/arena_net"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/battle/battle_register/battle_register.go → app/lev2/serv_bots/warbot/angar/battle/battle_register/battle_register.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
 )
 
 // СражениеРегистрация -- регистрирует танк к началу атаки

server/lev2/serv_bots/warbot/angar/battle/battle_wait/battle_wait.go → app/lev2/serv_bots/warbot/angar/battle/battle_wait/battle_wait.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
 )
 
 // СражениеОжидание -- ожидатель начала битвы

server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker.go

@@ -4,12 +4,12 @@ package battle_worker
 import (
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 // СражениеДействие -- исполнение битвы

server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/battle_sound.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/battle_sound.go

@@ -2,8 +2,8 @@ package battle_sound
 
 import (
 	"time"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/is_sound_play"
 	"wartank/pkg/components/sound"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/is_sound_play"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_worker.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_worker.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot/is_shot"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot/is_shot"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/death_match/death_worker/death_on/battlesound/battlesound.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battlesound/battlesound.go

@@ -2,8 +2,8 @@ package battle_sound
 
 import (
 	"time"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/is_sound_play"
 	"wartank/pkg/components/sound"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/is_sound_play"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health/health.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health/health.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	. "wartank/server/lev0/types"
+	. "wartank/app/lev0/types"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr/manevr.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr/manevr.go

@@ -5,10 +5,10 @@ import (
 	"log"
 	"strings"
 	"time"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health/repair_time"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr/is_manevr"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health/repair_time"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr/is_manevr"
 	// "wartank/internal/components/sound"
-	. "wartank/server/lev0/types"
+	. "wartank/app/lev0/types"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot/shot.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot/shot.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	. "wartank/server/lev0/types"
+	. "wartank/app/lev0/types"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/battle/battle_worker/battleon/battleon.go → app/lev2/serv_bots/warbot/angar/battle/battle_worker/battleon/battleon.go

@@ -4,14 +4,14 @@ import (
 	"context"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot/is_shot"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/health"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/manevr"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/shot/is_shot"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/bot_net_stat/net_stat.go → app/lev2/serv_bots/warbot/angar/bot_net_stat/net_stat.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
+	. "wartank/app/lev0/types"
 	"wartank/pkg/kernel/kernel_log"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
 )
 
 /*
@@ -16,7 +16,7 @@ import (
 
 // БотНетСтат -- статистика уровня бота
 type БотСетьСтат struct {
-	server ИСервер
+	server ИПриложение
 	бот    ИБот
 	лог    ИЯдроЛог
 }

server/lev2/serv_bots/warbot/angar/convoy/convoy.go → app/lev2/serv_bots/warbot/angar/convoy/convoy.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/bot_stat/stat_param"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/bot_stat/stat_param"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/death_match/battle.go → app/lev2/serv_bots/warbot/angar/death_match/battle.go

@@ -4,12 +4,12 @@ package death_match
 import (
 	"time"
 
+	. "wartank/app/lev0/types"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_register"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_wait"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker"
 	"wartank/pkg/arena"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_register"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_wait"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker"
 )
 
 // Сражение -- объект схватки

server/lev2/serv_bots/warbot/angar/death_match/battle_wait/battle_wait.go → app/lev2/serv_bots/warbot/angar/death_match/battle_wait/battle_wait.go

@@ -5,11 +5,11 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
 	"wartank/pkg/alias"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
 )
 
 // СражениеОжидание -- ожидатель начала битвы

server/lev2/serv_bots/warbot/angar/death_match/death_net/death_net.go → app/lev2/serv_bots/warbot/angar/death_match/death_net/death_net.go

@@ -1,9 +1,9 @@
 package death_net
 
 import (
+	. "wartank/app/lev0/types"
 	"wartank/pkg/components/arena_net"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
 )
 
 /*

server/lev2/serv_bots/warbot/angar/death_match/death_register/death_register.go → app/lev2/serv_bots/warbot/angar/death_match/death_register/death_register.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
+	. "wartank/app/lev0/types"
 	"wartank/pkg/arena"
 	"wartank/pkg/components/arena_net"
 	. "wartank/pkg/kernel/kernel_types"
-	. "wartank/server/lev0/types"
 )
 
 // СхваткаРегистрация -- регистрирует танк к началу схватки

server/lev2/serv_bots/warbot/angar/death_match/death_worker/death_on/battle_sound/battle_sound.go → app/lev2/serv_bots/warbot/angar/death_match/death_worker/death_on/battle_sound/battle_sound.go

@@ -2,8 +2,8 @@ package battle_sound
 
 import (
 	"time"
+	"wartank/app/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/is_sound_play"
 	"wartank/pkg/components/sound"
-	"wartank/server/lev2/serv_bots/warbot/angar/battle/battle_worker/battle_worker/battle_sound/is_sound_play"
 )
 
 /*