diff --git a/assets/all.headsdb.ron b/assets/all.headsdb.ron index e54c343..e3caf52 100644 --- a/assets/all.headsdb.ron +++ b/assets/all.headsdb.ron @@ -10,7 +10,7 @@ /*08*/(key:"highland hammer thrower", ability:Thrown, aps:2, ammo:10, damage:25, range:80, projectile:"hammer", interrupt_shoot:false), /*09*/(key:"legionnaire", ability:Gun, aps:2, ammo:25, range:60, damage:13, shoot_offset:0.1667), /*10*/(key:"mig pilot", ability:Missile, ammo:5, range:60, damage:100, controls:Plane, interrupt_shoot:false), - /*11*/(key:"nanny", ability:Thrown, range:60), + /*11*/(key:"nanny", ability:Thrown, ammo:5, range:60, projectile:"handbag"), /*12*/(key:"panic attack", ability:Turbo), /*13*/(key:"salty sea dog", ability:Boat), /*14*/(key:"snow plough operator", ability:Spray), diff --git a/assets/maps/map1.map b/assets/maps/map1.map index 502dab5..79b686d 100644 --- a/assets/maps/map1.map +++ b/assets/maps/map1.map @@ -1682,3 +1682,12 @@ "key" "" "disable_ai" "true" } +// entity 54 +{ +"classname" "enemy_spawn" +"origin" "-184 88 -232" +"angles" "0 0 0" +"head" "nanny" +"key" "" +"disable_ai" "true" +} diff --git a/assets/models/characters/nanny.glb b/assets/models/characters/nanny.glb new file mode 100644 index 0000000..7f68eb8 Binary files /dev/null and b/assets/models/characters/nanny.glb differ diff --git a/crates/shared/src/character.rs b/crates/shared/src/character.rs index 311aa1a..7068eb1 100644 --- a/crates/shared/src/character.rs +++ b/crates/shared/src/character.rs @@ -99,7 +99,7 @@ fn spawn( .get(format!("{key}.glb").as_str()) .unwrap_or_else(|| { //TODO: remove once we use the new format for all - info!("Character not found, using default [{}]", key); + error!("Character not found, using default [{}]", key); &assets.characters["angry demonstrator.glb"] }); let asset = gltf_assets.get(handle).unwrap();