Fix Damage taken when boarding fails

.github/size_labeler.yml

@@ -0,0 +1,30 @@
+version: 1
+appendOnly: false
+labels:
+- label: "Size: Tiny"
+  size:
+    below: 50
+
+- label: "Size: Small"
+  size:
+    above: 49
+    below: 200
+
+- label: "Size: Medium"
+  size:
+    above: 199
+    below: 400
+
+- label: "Size: Big"
+  size:
+    above: 399
+    below: 800
+
+- label: "Size: Huge"
+  size:
+    above: 799
+    below: 1600
+
+- label: "Size: Epic"
+  size:
+    above: 1599

.github/srvaroa_labeler.yml

@@ -40,7 +40,3 @@ labels:
   title: "^perf"
 - label: "PR: Performance"
   body: "(?i)(\\[performance\\]|\\[perf\\])"
-
-- label: "PR: Major Coding"
-  size:
-    above: 800

.github/stale_labeler.yml

@@ -0,0 +1,6 @@
+version: 1
+appendOnly: false
+labels:
+  - label: "Status: Stale"
+    last-modified:
+      at-least: 2w

.github/workflows/labeler.yml → .github/workflows/open_labeler.yml

@@ -18,11 +18,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - name: "File Based Labeler"
-      uses: actions/labeler@v5
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        sync-labels: false
     - name: "Content Based Labeler"
       uses: srvaroa/labeler@master
       env:

.github/workflows/stale_labeler.yml

@@ -0,0 +1,20 @@
+name: "Stale Labeler"
+on:
+  schedule:
+    - cron: "0 00 * * *"   # <=== Change this value
+
+jobs:
+  labeler:
+    name: Label Stale Things
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Run Srvaroa Labeler"
+        uses: srvaroa/labeler@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          config_path: .github/stale_labeler.yml
+          fail_on_error: true

.github/workflows/sync_labeler.yml

@@ -0,0 +1,32 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler
+
+name: "PR Sync Labeler"
+on:
+  pull_request_target:
+    types: [opened, edited, synchronize]
+
+jobs:
+  labeler:
+    name: Sync PR Labels
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: "File Based Labeler"
+        uses: actions/labeler@v5
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          sync-labels: true
+      - name: "Size Based Labeler"
+        uses: srvaroa/labeler@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          config_path: .github/size_labeler.yml
+          fail_on_error: true

datafiles/main/chapters/1.JSON

@@ -56,6 +56,9 @@
             "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant
             //"trim_on": 0 // 0 no, 1 yes for special trim colours // todo update ref for new name
         },
+        "culture_styles" : [
+            "Knightly",
+        ],
         "names": {
             //Chapter Staff
             "hchaplain": "Sapphon",

datafiles/main/chapters/10.JSON

@@ -57,6 +57,10 @@
             "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant
             //"trim_on": 0 // 0 no, 1 yes for special trim colours 
         },
+        "culture_styles" : [
+            "Knightly",
+            "Crusader"
+        ],
         "names": {
             //Chapter Staff
             "hchaplain": "Grimaldus",

datafiles/main/chapters/11.JSON

@@ -56,6 +56,9 @@
             "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant
             //"trim_on": 1 // 0 no, 1 yes for pauldron trim colours. Trim colour will still be used for certain complex livery items 
         },
+        "culture_styles" : [
+            "Greek",
+        ],
         "names": {
             //Chapter Staff
             "hchaplain": "Ivanus Enkomi", // Head Chaplain

datafiles/main/chapters/2.JSON

@@ -24,6 +24,7 @@
         "recruiting_name": "",
         "discipline": "rune Magick", // one of 'default' 'biomancy' 'pyromancy' 'telekinesis' 'rune Magick'
         "aspirant_trial": "SURVIVAL", // ? need to find the best way to do this
+
         "advantages": [ //TODO something with these after rework of adv organisation
             "",
             "Lightning Warriors",
@@ -57,6 +58,9 @@
             "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant
             //"trim_on": 0 // 0 no, 1 yes for special trim colours // todo update ref for new name
         },
+        "culture_styles" : [
+            "Mongol",
+        ],
         "names": {
             //Chapter Staff
             "hchaplain": "Jaghorin",

datafiles/main/chapters/7.JSON

@@ -58,6 +58,10 @@
             "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant
             //"trim_on": 0 // 0 no, 1 yes for special trim colours 
         },
+        "culture_styles" : [
+            "Roman",
+            "Ultra"
+        ],
         "names": {
             //Chapter Staff
             "hchaplain": "Ortan Cassius",

datafiles/main/visual_sets/Company_marks_roman_right_knee/data.json

@@ -0,0 +1,9 @@
+[
+	{
+		"name" : "test_sprite",
+		"data" : {
+			"body_types" :[0],
+			"position" : "head",        
+    	},
+	}
+]

datafiles/main/visual_sets/Company_marks_roman_right_shoulder/data.json

@@ -0,0 +1,82 @@
+[
+	{
+		"name" : "one",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [1],        
+    	},
+	},
+	{
+		"name" : "two",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [2],        
+    	},
+	},
+	{
+		"name" : "three",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [3],        
+    	},
+	},
+	{
+		"name" : "four",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [4],        
+    	},
+	},
+	{
+		"name" : "five",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [5],        
+    	},
+	},
+	{
+		"name" : "six",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [6],        
+    	},
+	},
+	{
+		"name" : "seven",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [7],        
+    	},
+	},
+	{
+		"name" : "eight",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [8],        
+    	},
+	},
+	{
+		"name" : "nine",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [9],        
+    	},
+	},
+	{
+		"name" : "ten",
+		"data" : {
+			"body_types" :[0],
+			"position" : "right_pauldron",
+			"company" : [10],        
+    	},
+	},		
+]

datafiles/main/visual_sets/Test_set/data.json

@@ -0,0 +1,9 @@
+[
+	{
+		"name" : "test_sprite",
+		"data" : {
+			"body_types" :[0],
+			"position" : "head",        
+    	},
+	}
+]

datafiles/main/visual_sets/use_sets.json

@@ -0,0 +1,3 @@
+[
+	"Company_marks_roman_right_shoulder"
+]

objects/obj_controller/Create_0.gml

@@ -539,6 +539,7 @@ command_set[20]=1;
 command_set[24]=1;
 modest_livery=0;
 progenitor_visuals=0;
+tagged_training=0;
 
 // ** Default menu items **
 selecting_planet=0;

objects/obj_creation/Create_0.gml

@@ -98,7 +98,7 @@ if (nope!=1){
 }
 
 global.load=0;
-
+planet_types = ARR_planet_types;
 skip=false;
 premades=true;
 
@@ -219,8 +219,80 @@ buttons = {
             str1 : "four",
             font : fnt_40k_14b
         },                    
-    ], "Home System Planets"),        
+    ], "Home System Planets"), 
+
+    culture_styles : new multi_select([
+        {
+            str1 : "Greek",
+            font : fnt_40k_14b,
+        },
+        {
+            str1 : "Roman",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Knightly",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Gladiator",
+            font : fnt_40k_14b
+        },         
+        {
+            str1 : "Mongol",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Feral",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Flame Cult",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Mechanical Cult",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Prussian",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Ganger (cthonian)",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Alpha",
+            font : fnt_40k_14b
+        },
+        {
+            str1 : "Ultra",
+            font : fnt_40k_14b
+        },
+        {   
+            str1 : "Renaissance",
+            font : fnt_40k_14b,
+        },
+        {   
+            str1 : "Blood",
+            font : fnt_40k_14b,
+        },
+        {   
+            str1 : "Angelic",
+            font : fnt_40k_14b,
+        },
+        {   
+            str1 : "Crusader",
+            font : fnt_40k_14b,
+        },
+        {   
+            str1 : "Gothic",
+            font : fnt_40k_14b,
+        },                                                                              
+    ], "Chapter Visual Styles")  
 }
+
 with (buttons){
     home_spawn_loc_options.current_selection = 1;
     home_planets.current_selection = 1;

objects/obj_event/Step_0.gml

@@ -321,10 +321,10 @@ if (ticked=1){// Select a random marine and have them perform an action
 
 
         if (attend_corrupted[ide]=0){
-            if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "Chaos")){
+            if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "chaos")){
                 unit.corruption+=choose(1,2,3,4);
             }
-            if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "Daemon")){
+            if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "daemonic")){
                 unit.corruption+=choose(6,7,8,9);
             }
             attend_corrupted[ide]=1;