Merge pull request #90 from frank9999/backports

Add world generator and new map tiles
FrankProjects · Aug 10, 2019 · 9fed889 · 9fed889
2 parents 2b66447 + 956b2ee
commit 9fed889
Show file tree

Hide file tree

Showing 91 changed files with 1,440 additions and 16,819 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,8 @@
         "symfony/web-profiler-bundle": "^4.3",
         "symfony/webpack-encore-bundle": "^1.4",
         "symfony/yaml": "^4.3",
-        "twig/twig": "^2.10"
+        "twig/twig": "^2.10",
+        "ext-gd": "*"
     },
     "require-dev": {
         "symfony/dotenv": "^4.3"

diff --git a/composer.lock b/composer.lock
diff --git a/config/doctrine/World.orm.yml b/config/doctrine/World.orm.yml
@@ -23,9 +23,9 @@ FrankProjects\UltimateWarfare\Entity\World:
             options:
                 fixed: false
         image:
-            type: string
+            type: text
             nullable: false
-            length: 100
+            length: 65535
             options:
                 fixed: false
         description:
@@ -79,6 +79,9 @@ FrankProjects\UltimateWarfare\Entity\World:
         players:
             targetEntity: Player
             mappedBy: world
+        worldRegions:
+            targetEntity: WorldRegion
+            mappedBy: world
         worldSectors:
             targetEntity: WorldSector
             mappedBy: world

diff --git a/config/doctrine/WorldCountry.orm.yml b/config/doctrine/WorldCountry.orm.yml
@@ -1,6 +1,9 @@
 FrankProjects\UltimateWarfare\Entity\WorldCountry:
     type: entity
     table: world_country
+    uniqueConstraints:
+        unique_world_country:
+            columns: [ x, y, sector_id ]
     id:
         id:
             type: integer
@@ -16,27 +19,15 @@ FrankProjects\UltimateWarfare\Entity\WorldCountry:
             nullable: false
             options:
                 unsigned: true
-        'y':
+        y:
             type: integer
             nullable: false
             options:
                 unsigned: true
-        cX:
-            type: integer
-            nullable: false
-            options:
-                unsigned: true
-            column: c_x
-        cY:
-            type: integer
-            nullable: false
-            options:
-                unsigned: true
-            column: c_y
         image:
-            type: string
+            type: text
             nullable: false
-            length: 200
+            length: 65535
             options:
                 fixed: false
     oneToMany:

diff --git a/config/doctrine/WorldRegion.orm.yml b/config/doctrine/WorldRegion.orm.yml
@@ -2,13 +2,18 @@ FrankProjects\UltimateWarfare\Entity\WorldRegion:
     type: entity
     table: world_region
     indexes:
-        countryId:
+        worldxy:
             columns:
-                - country_id
+                - world_id
+                - x
+                - y
         regionInSector:
             columns:
                 - sector_id
                 - player_id
+    uniqueConstraints:
+        unique_world_region:
+            columns: [ x, y, world_id ]
     id:
         id:
             type: integer
@@ -19,34 +24,22 @@ FrankProjects\UltimateWarfare\Entity\WorldRegion:
             generator:
                 strategy: IDENTITY
     fields:
-        region:
-            type: integer
-            nullable: false
-            options:
-                unsigned: true
         x:
             type: integer
             nullable: false
             options:
                 unsigned: true
-        'y':
-            type: integer
-            nullable: false
-            options:
-                unsigned: true
-        rX:
+        y:
             type: integer
             nullable: false
             options:
                 unsigned: true
-            column: r_x
-        rY:
+        z:
             type: integer
             nullable: false
             options:
                 unsigned: true
-            column: r_y
-        image:
+        type:
             type: string
             nullable: false
             length: 100
@@ -61,7 +54,7 @@ FrankProjects\UltimateWarfare\Entity\WorldRegion:
         name:
             type: string
             nullable: true
-            length: 10
+            length: 32
             options:
                 fixed: false
         space:
@@ -90,22 +83,28 @@ FrankProjects\UltimateWarfare\Entity\WorldRegion:
             targetEntity: Fleet
             mappedBy: targetWorldRegion
     manyToOne:
-       worldCountry:
-           targetEntity: WorldCountry
-           inversedBy: worldRegions
-           joinColumn:
-               name: country_id
-               referencedColumnName: id
-       worldSector:
-           targetEntity: WorldSector
-           inversedBy: worldRegions
-           joinColumn:
-               name: sector_id
-               referencedColumnName: id
-       player:
-           targetEntity: Player
-           inversedBy: worldRegions
-           joinColumn:
-               name: player_id
-               referencedColumnName: id
+        world:
+            targetEntity: World
+            inversedBy: worldRegions
+            joinColumn:
+                name: world_id
+                referencedColumnName: id
+        worldCountry:
+            targetEntity: WorldCountry
+            inversedBy: worldRegions
+            joinColumn:
+                name: country_id
+                referencedColumnName: id
+        worldSector:
+            targetEntity: WorldSector
+            inversedBy: worldRegions
+            joinColumn:
+                name: sector_id
+                referencedColumnName: id
+        player:
+            targetEntity: Player
+            inversedBy: worldRegions
+            joinColumn:
+                name: player_id
+                referencedColumnName: id
     lifecycleCallbacks: {  }
diff --git a/config/doctrine/WorldSector.orm.yml b/config/doctrine/WorldSector.orm.yml
@@ -1,6 +1,9 @@
 FrankProjects\UltimateWarfare\Entity\WorldSector:
     type: entity
     table: world_sector
+    uniqueConstraints:
+        unique_world_sector:
+            columns: [ x, y, world_id ]
     id:
         id:
             type: integer
@@ -16,15 +19,15 @@ FrankProjects\UltimateWarfare\Entity\WorldSector:
             nullable: false
             options:
                 unsigned: true
-        'y':
+        y:
             type: integer
             nullable: false
             options:
                 unsigned: true
         image:
-            type: string
+            type: text
             nullable: false
-            length: 200
+            length: 65535
             options:
                 fixed: false
     oneToMany:

diff --git a/config/routes.yaml b/config/routes.yaml
@@ -126,6 +126,18 @@ Admin/World/Create:
     path:      /admin/world/create
     controller: FrankProjects\UltimateWarfare\Controller\Admin\WorldController::create
 
+Admin/World/Generate:
+    path:      /admin/world/generate/{worldId}
+    controller: FrankProjects\UltimateWarfare\Controller\Admin\WorldController::generate
+    requirements:
+        worldId: '\d+'
+
+Admin/World/GenerateImages:
+    path:      /admin/world/generate-images/{worldId}
+    controller: FrankProjects\UltimateWarfare\Controller\Admin\WorldController::generateImages
+    requirements:
+        worldId: '\d+'
+
 Admin/World/List:
     path:      /admin/world/list
     controller: FrankProjects\UltimateWarfare\Controller\Admin\WorldController::list

diff --git a/public/css/main.css b/public/css/main.css
@@ -94,3 +94,9 @@ div.worldmaptext{
 .bad {
     color:#FF2200;
 }
+
+.table-world-generator td{
+    padding: 0;
+    border: 0;
+    line-height: 0.25;
+}
diff --git a/public/images/map/beach.jpg b/public/images/map/beach.jpg
diff --git a/public/images/map/map18.jpg → public/images/map/forrest.jpg b/public/images/map/map18.jpg → public/images/map/forrest.jpg
diff --git a/public/images/map/map1.jpg b/public/images/map/map1.jpg
diff --git a/public/images/map/map10.jpg b/public/images/map/map10.jpg
diff --git a/public/images/map/map11.jpg b/public/images/map/map11.jpg
diff --git a/public/images/map/map12.jpg b/public/images/map/map12.jpg
diff --git a/public/images/map/map13.jpg b/public/images/map/map13.jpg
diff --git a/public/images/map/map14.jpg b/public/images/map/map14.jpg
diff --git a/public/images/map/map15.jpg b/public/images/map/map15.jpg
diff --git a/public/images/map/map16.jpg b/public/images/map/map16.jpg
diff --git a/public/images/map/map17.jpg b/public/images/map/map17.jpg
diff --git a/public/images/map/map19.jpg b/public/images/map/map19.jpg
diff --git a/public/images/map/map2.jpg b/public/images/map/map2.jpg
diff --git a/public/images/map/map20.jpg b/public/images/map/map20.jpg
diff --git a/public/images/map/map21.jpg b/public/images/map/map21.jpg
diff --git a/public/images/map/map22.jpg b/public/images/map/map22.jpg
diff --git a/public/images/map/map23.jpg b/public/images/map/map23.jpg
diff --git a/public/images/map/map24.jpg b/public/images/map/map24.jpg
diff --git a/public/images/map/map25.jpg b/public/images/map/map25.jpg
diff --git a/public/images/map/map26.jpg b/public/images/map/map26.jpg
diff --git a/public/images/map/map27.jpg b/public/images/map/map27.jpg
diff --git a/public/images/map/map28.jpg b/public/images/map/map28.jpg
diff --git a/public/images/map/map3.jpg b/public/images/map/map3.jpg
diff --git a/public/images/map/map31.jpg b/public/images/map/map31.jpg
diff --git a/public/images/map/map32.jpg b/public/images/map/map32.jpg
diff --git a/public/images/map/map33.jpg b/public/images/map/map33.jpg
diff --git a/public/images/map/map34.jpg b/public/images/map/map34.jpg
diff --git a/public/images/map/map35.jpg b/public/images/map/map35.jpg
diff --git a/public/images/map/map4.jpg b/public/images/map/map4.jpg
diff --git a/public/images/map/map5.jpg b/public/images/map/map5.jpg
diff --git a/public/images/map/map6.jpg b/public/images/map/map6.jpg
diff --git a/public/images/map/map7.jpg b/public/images/map/map7.jpg
diff --git a/public/images/map/map8.jpg b/public/images/map/map8.jpg
diff --git a/public/images/map/map9.jpg b/public/images/map/map9.jpg
diff --git a/public/images/map/map36.jpg → public/images/map/water.jpg b/public/images/map/map36.jpg → public/images/map/water.jpg
diff --git a/public/images/world/game_type_1.jpg b/public/images/world/game_type_1.jpg
diff --git a/public/images/world/game_type_2.jpg b/public/images/world/game_type_2.jpg
diff --git a/public/js/jquery-3.3.1.min.js b/public/js/jquery-3.3.1.min.js
diff --git a/public/js/jquery-3.4.1.min.js b/public/js/jquery-3.4.1.min.js