Merge branch 'develop' into feature/36-level-design

assets/game_assets/blueprints/anti_sun.json

+{
+  "Transform": {
+  },
+  "Directional_light": {
+    "source_radius": 1.0,
+    "intensity": 80.0,
+    "color": {
+      "r": 1,
+      "g": 0.4,
+      "b": 0.4
+    },
+    "shadow_intensity": 10.0,
+    "shadow_size": 25,
+    "near_plane": 10.0,
+    "far_plane": 100,
+    "update_frequency": 1,
+    "light_particles": false
+  }
+}

assets/game_assets/blueprints/camera.json

@@ -3,7 +3,10 @@
   "Camera": {
     "fov": 50.0,
     "near": 0.05,
-    "far": 80.0
+    "far": 80.0,
+    "dof_focus": 15,
+    "dof_range": 3,
+    "dof_power": 0.5
   },
   "Viewtarget": {
     "offset": {

assets/game_assets/blueprints/ceiling.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:ceiling"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/blueprints/floor.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:floor"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/blueprints/player.json

 {
 	"Transform": {
 		"scale": {
-			"x": 1.0,
-			"y": 1.0,
-			"z": 1.0
+			"x": 0.015,
+			"y": 0.015,
+			"z": 0.015
 		}
 	},
 	"Model": {
 		"aid": "model:character"
 	},
+	"Material_property": {
+		"emissive_color": {"a": 4000}
+	},
 	"Shadowcaster": {},
 	"Movement": {
 		"beats_per_step": 1,
@@ -19,14 +22,26 @@
 	},
 	"Input_controller": {},
 	"Player": {},
-  "Dash": {
-    "attack_width": 0.5
-  },
-  "Stationary_attack": {
-    "radius": 5.5
-  },
-  "Rigid_body": {
-    "radius": 0.5
-  },
-  "Target": {}
+	"Dash": {
+		"attack_width": 0.5
+	},
+	"Stationary_attack": {
+		"radius": 3
+	},
+	"Rigid_body": {
+		"radius": 0.5
+	},
+	"Target": {},
+	"Pose": {
+		"skeleton": "skel:character"
+	},
+	"Animation": {},
+	"Simple_animation_controller": {
+		"animations": {
+			"idle": "anim:idle"
+		},
+		"current_animation": {
+			"id": "idle"
+		}
+	}
 }

assets/game_assets/blueprints/special_attack_marker.json

+{
+	"Transform":{
+		"scale": {"x": 1.0, "y": 1.0, "z": 1.0}
+	},
+	"Particle_system": {
+		"cfg": "particle_sys:special_attack_particle_system"
+	}
+}

assets/game_assets/blueprints/sun.json

@@ -3,13 +3,13 @@
   },
   "Directional_light": {
     "source_radius": 1.0,
-    "intensity": 1000.0,
+    "intensity": 190.0,
     "color": {
       "r": 1,
-      "g": 1,
-      "b": 1
+      "g": 0.8,
+      "b": 0.8
     },
-    "shadow_intensity": 2.0,
+    "shadow_intensity": 0.0,
     "shadow_size": 25,
     "near_plane": 10.0,
     "far_plane": 100,

assets/game_assets/blueprints/wall_horizontal.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:wall_horizontal"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/blueprints/wall_vertical.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:wall_vertical"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/level/dummy.lvl

-dummy
+tileset
 ##################
 ##----############
 #|    |---------##

assets/game_assets/level/proto.lvl

 dummy
-####################
-###|--------|#######
-#|-|  7|   5|--|####
-#|     3       |####
-#|-|  7| 1  || |####
-###|--------|| |####
-#############| |####
-##########|--| |--|#
-##########|       |#
-##########|       |#
-##########|       |#
-##########|  <@>  |#
-##########|  > <  |#
-##########|       |#
-##########|   !   |#
-##########|-------|#
-####################
+################################
+#|------------------|#|-------|#
+#|  -  h     h     h|#|   G   |#
+#| p     h  hhh    h|#|       |#
+#|     h     h     h|#| --    |#
+#|-------------|    |#| --h-- |#
+####|----------|h   |#| h  -- |#
+####|    b   b      |#|     h |#
+####|  b   b       h|#| --    |#
+####|b |-------|    |#| --    |#
+####|  |-------|h   |-|     h |#
+####|  h h   h                |#
+####| h  h  h h   h      -    |#
+####| h  h  h h               |#
+####|-------------------------|#
+################################

assets/game_assets/materials/ceiling_floor.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "ceiling_floor_albedo.ktx",
+    "normal_aid": "ceiling_floor_normal.ktx",
+    "brdf_aid": "ceiling_floor_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_boots.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_boots.002_albedo.ktx",
+    "normal_aid": "character_boots.002_normal.ktx",
+    "brdf_aid": "character_boots.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_face.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_face.002_albedo.ktx",
+    "normal_aid": "character_face.002_normal.ktx",
+    "brdf_aid": "character_face.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_gelenke.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_gelenke.002_albedo.ktx",
+    "normal_aid": "character_gelenke.002_normal.ktx",
+    "brdf_aid": "character_gelenke.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_glow.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_glow.002_albedo.ktx",
+    "normal_aid": "character_glow.002_normal.ktx",
+    "brdf_aid": "character_glow.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_handschuhe.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_handschuhe.002_albedo.ktx",
+    "normal_aid": "character_handschuhe.002_normal.ktx",
+    "brdf_aid": "character_handschuhe.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_hose.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_hose.002_albedo.ktx",
+    "normal_aid": "character_hose.002_normal.ktx",
+    "brdf_aid": "character_hose.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_rüstung.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_rüstung.002_albedo.ktx",
+    "normal_aid": "character_rüstung.002_normal.ktx",
+    "brdf_aid": "character_rüstung.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_sword.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_sword.002_albedo.ktx",
+    "normal_aid": "character_sword.002_normal.ktx",
+    "brdf_aid": "character_sword.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/floor_floor.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "floor_floor_albedo.ktx",
+    "normal_aid": "floor_floor_normal.ktx",
+    "brdf_aid": "floor_floor_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/idle_defaultmaterial.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "idle_defaultmaterial_albedo.ktx",
+    "normal_aid": "idle_defaultmaterial_normal.ktx",
+    "brdf_aid": "idle_defaultmaterial_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_horizontal_glow1.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_glow1_albedo.ktx",
+    "normal_aid": "wall_horizontal_glow1_normal.ktx",
+    "brdf_aid": "wall_horizontal_glow1_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_horizontal_glow2.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_glow2_albedo.ktx",
+    "normal_aid": "wall_horizontal_glow2_normal.ktx",
+    "brdf_aid": "wall_horizontal_glow2_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_horizontal_wall_inner.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_wall_inner_albedo.ktx",
+    "normal_aid": "wall_horizontal_wall_inner_normal.ktx",
+    "brdf_aid": "wall_horizontal_wall_inner_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_horizontal_wall_outer.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_wall_outer_albedo.ktx",
+    "normal_aid": "wall_horizontal_wall_outer_normal.ktx",
+    "brdf_aid": "wall_horizontal_wall_outer_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_vertical_glow1.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_glow1_albedo.ktx",
+    "normal_aid": "wall_vertical_glow1_normal.ktx",
+    "brdf_aid": "wall_vertical_glow1_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_vertical_glow2.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_glow2_albedo.ktx",
+    "normal_aid": "wall_vertical_glow2_normal.ktx",
+    "brdf_aid": "wall_vertical_glow2_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_vertical_wall_inner.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_wall_inner_albedo.ktx",
+    "normal_aid": "wall_vertical_wall_inner_normal.ktx",
+    "brdf_aid": "wall_vertical_wall_inner_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_vertical_wall_outer.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_wall_outer_albedo.ktx",
+    "normal_aid": "wall_vertical_wall_outer_normal.ktx",
+    "brdf_aid": "wall_vertical_wall_outer_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/particles/enemy_death_particle_system.json

@@ -2,7 +2,7 @@
 	"emitters": [{
 		"spawn": [
 			{"particles_per_second": 300, "stddev":150, "time": 0.5},
-			{"particles_per_second": 0, "stddev":0, "time": 999}
+			{"particles_per_second": 0, "stddev":0, "time": 1}
 		],
 		"spawn_loop": false,
 

assets/game_assets/particles/enemy_death_particles.json

@@ -2,7 +2,7 @@
 	"keyframes": [
 		{
 			"time": 0,
-			"color": {"mean":{"hue":0, "saturation":1, "alpha":20}, "stddev":{"hue":0.001}},
+			"color": {"mean":{"hue":0, "saturation":1, "alpha":3}, "stddev":{"hue":0.001}},
 			"size": {"mean": {"x": 0.5, "y":0.5, "z":0.5}, "stddev":{"x": 0.3, "y":0.3, "z":0.3}},
 			"rotation": {"mean":{"angle":0}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
 			"drag": 0.1

assets/game_assets/particles/special_attack_particle_system.json

+{
+	"emitters": [{
+		"spawn": [
+			{"particles_per_second": 2000, "stddev":0, "time": 0.01},
+			{"particles_per_second": 0, "stddev":0, "time": 1}
+		],
+		"spawn_loop": false,
+
+		"size": {"x":0.0, "y":0.0},
+		"direction": {"mean":{"elevation":0.0, "azimuth":0.5}, "stddev":{"elevation":0.02, "azimuth":1}},
+
+		"ttl": {"mean": 0.8, "stddev": 0.0},
+		
+		"velocity": {"mean": 16, "stddev": 0.0},
+
+		"emit_script_id": "comp_shader:particle_spawn_sphere",
+
+		"type_id": "particle_def:special_attack_particles"
+	}]
+}

assets/game_assets/particles/special_attack_particles.json

+{
+	"keyframes": [
+		{
+			"time": 0.0,
+			"color": {"mean":{"hue":0.472, "saturation":1, "value":0.0, "alpha":0}, "stddev":{"hue":0.01}},
+			"size": {"mean": {"x": 0.0, "y":0.0, "z":0.0}},
+			"rotation": {"mean":{"angle":1}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
+			"drag": 0.0
+		},
+		{
+			"time": 0.1,
+			"color": {"mean":{"hue":0.472, "saturation":1, "alpha":6}, "stddev":{"hue":0.004}},
+			"size": {"mean": {"x": 0.5, "y":0.5, "z":0.5}, "stddev":{"x": 0.1, "y":0.1, "z":0.1}},
+			"rotation": {"mean":{"angle":0}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
+			"drag": 0.1
+		},
+		{
+			"time": 0.8,
+			"color": {"mean":{"hue":0.472, "saturation":1, "value":0.0, "alpha":0}, "stddev":{"hue":0.01}},
+			"size": {"mean": {"x": 0.0, "y":0.0, "z":0.0}},
+			"rotation": {"mean":{"angle":1}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
+			"drag": 1.0
+		}
+	],
+
+	"symmetric_scaling": true,
+	"rotate_with_velocity": true,
+	"blend": "solid",
+
+	"geometry": "mesh",
+	"model_id": "model:tetr",
+
+	"update_script_id": "comp_shader:particle_update_simple"
+}