전투태세, 첩보 추가, 기존 코드 일부 정리

2018-10-20 16:45:57 +09:00
parent aecbf8ccb3
commit aa19ae129b
18 changed files with 476 additions and 216 deletions
@@ -336,43 +336,41 @@ ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 ## 도시 테이블
 ###########################################################################
 ## trade 100 이 표준 시세
-create table city (
-  `city` INT(6) NOT NULL AUTO_INCREMENT,
+CREATE TABLE `city` (
+	`city` INT(6) NOT NULL AUTO_INCREMENT,
 	`name` CHAR(64) NOT NULL,
-  level  int(1) default 0,
-  upgrading int(1) default 0,
-  nation int(6) default 0,
-  supply int(1) default 1,
-  path   char(32) default '',
-  front  int(1) default 0,
-  pop    int(7) default 50000,
-  pop2   int(7) default 50000,
-  agri   int(5) default 0,
-  agri2  int(5) default 0,
-  comm   int(5) default 0,
-  comm2  int(5) default 0,
-  secu   int(5) default 0,
-  secu2  int(5) default 0,
-  trust  float default 0,
-  trade  int(3) default 100,
-  dead   int(7) default 0,
-  def    int(5) default 0,
-  def2   int(5) default 0,
-  wall   int(5) default 0,
-  wall2  int(5) default 0,
-  gen1   int(4) default 0,
-  gen2   int(4) default 0,
-  gen3   int(4) default 0,
-  gen1set int(1) default 0,
-  gen2set int(1) default 0,
-  gen3set int(1) default 0,
-  state   int(2) default 0,
-  region  int(2) default 0,
-  term    int(1) default 0,
-  conflict    varchar(500) default '{}',
-
-  PRIMARY KEY (city),
-  KEY (nation)
+	`level` INT(1) NOT NULL,
+	`upgrading` INT(1) NOT NULL DEFAULT '0',
+	`nation` INT(6) NOT NULL DEFAULT '0',
+	`supply` INT(1) NOT NULL DEFAULT '1',
+	`front` INT(1) NOT NULL DEFAULT '0',
+	`pop` INT(7) NOT NULL,
+	`pop2` INT(7) NOT NULL,
+	`agri` INT(5) NOT NULL,
+	`agri2` INT(5) NOT NULL,
+	`comm` INT(5) NOT NULL,
+	`comm2` INT(5) NOT NULL,
+	`secu` INT(5) NOT NULL,
+	`secu2` INT(5) NOT NULL,
+	`trust` FLOAT NOT NULL,
+	`trade` INT(3) NULL DEFAULT NULL,
+	`dead` INT(7) NOT NULL DEFAULT '0',
+	`def` INT(5) NOT NULL,
+	`def2` INT(5) NOT NULL,
+	`wall` INT(5) NOT NULL,
+	`wall2` INT(5) NOT NULL,
+	`gen1` INT(4) NOT NULL DEFAULT '0',
+	`gen2` INT(4) NOT NULL DEFAULT '0',
+	`gen3` INT(4) NOT NULL DEFAULT '0',
+	`gen1set` INT(1) NOT NULL DEFAULT '0',
+	`gen2set` INT(1) NOT NULL DEFAULT '0',
+	`gen3set` INT(1) NOT NULL DEFAULT '0',
+	`state` INT(2) NOT NULL DEFAULT '0',
+	`region` INT(2) NOT NULL COMMENT 'TODO:Delete',
+	`term` INT(1) NOT NULL DEFAULT '0',
+	`conflict` VARCHAR(500) NOT NULL DEFAULT '{}',
+	PRIMARY KEY (`city`),
+	INDEX `nation` (`nation`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;

 ###########################################################################