summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/encyclopediae/default_encyclopedia.json12
-rw-r--r--src/components/mod.rs4
-rw-r--r--src/componentwrapper.rs6
-rw-r--r--src/room.rs2
-rw-r--r--src/systems/building.rs12
-rw-r--r--src/systems/growth.rs15
6 files changed, 27 insertions, 24 deletions
diff --git a/content/encyclopediae/default_encyclopedia.json b/content/encyclopediae/default_encyclopedia.json
index c47f738..53c5a56 100644
--- a/content/encyclopediae/default_encyclopedia.json
+++ b/content/encyclopediae/default_encyclopedia.json
@@ -226,7 +226,7 @@
"flags": ["Occupied"]
},
"plantedradishseed": {
- "arguments": [["target_time", "int", 0]],
+ "arguments": [["target_time", "int", -1]],
"sprite": "seed",
"height": 0.05,
"name": "seed",
@@ -244,7 +244,7 @@
"flags": ["Occupied"]
},
"radishseedling": {
- "arguments": [["target_time", "int", 0]],
+ "arguments": [["target_time", "int", -1]],
"sprite": "seedling",
"height": 0.05,
"name": "seedling",
@@ -262,7 +262,7 @@
"flags": ["Occupied"]
},
"youngradishplant": {
- "arguments": [["target_time", "int", 0]],
+ "arguments": [["target_time", "int", -1]],
"sprite": "youngplant",
"height": 0.8,
"name": "youngradishplant",
@@ -325,7 +325,7 @@
]
},
"plantedseed": {
- "arguments": [["target_time", "int", 0], ["next", "template"], ["delay", "int"]],
+ "arguments": [["target_time", "int", -1], ["next", "template"], ["delay", "int"]],
"sprite": "seed",
"height": 0.05,
"name": "plantedseed",
@@ -343,7 +343,7 @@
"flags": ["Occupied"]
},
"seedling": {
- "arguments": [["target_time", "int", 0], ["next", "template"], ["delay", "int"]],
+ "arguments": [["target_time", "int", -1], ["next", "template"], ["delay", "int"]],
"sprite": "seed",
"height": 0.09,
"name": "seedling",
@@ -361,7 +361,7 @@
"flags": ["Occupied"]
},
"youngplant": {
- "arguments": [["target_time", "int", 0], ["next", "template"], ["crop", "string"], ["delay", "int"]],
+ "arguments": [["target_time", "int", -1], ["next", "template"], ["crop", "string"], ["delay", "int"]],
"components": [
["Grow", {
"delay": ["arg", "delay"],
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 53de41c..49aacfc 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -218,8 +218,8 @@ pub struct Grow {
#[derive(Component, Debug, Clone)]
#[storage(HashMapStorage)]
-pub struct OwnTime {
- pub time: Timestamp
+pub struct TimeOffset {
+ pub dtime: i64
}
diff --git a/src/componentwrapper.rs b/src/componentwrapper.rs
index 7a9f2a0..beee01f 100644
--- a/src/componentwrapper.rs
+++ b/src/componentwrapper.rs
@@ -217,11 +217,11 @@ components!(
Grow {
trigger: Trigger::from_str(&trigger).ok_or(aerr!("invalid trigger name {}", trigger))?,
delay,
- target_time: if target_time == 0 { None } else { Some(Timestamp(target_time)) }
- // please forgive me for using 0 as null
+ target_time: if target_time == -1 { None } else { Some(Timestamp(target_time)) }
+ // please forgive me for using -1 as null
};
Equipment () {panic!("equipment from parameters not implemented")};
- OwnTime (time: Int) {OwnTime{time: Timestamp(time)}};
+ TimeOffset (dtime: Int);
Flags (flags: List) {
Flags(
flags
diff --git a/src/room.rs b/src/room.rs
index 1051e28..afe617b 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -120,7 +120,7 @@ impl <'a, 'b>Room<'a, 'b> {
world.insert(NewEntities::new(encyclopedia));
register_insert!(
world,
- (Position, Visible, Controller, Movable, New, Removed, Moved, Player, Inventory, Health, Serialise, RoomExit, Entered, TriggerBox, Trap, Fighter, Healing, Volatile, ControlCooldown, Autofight, MonsterAI, Home, AttackInbox, Item, Spawner, Clan, Faction, Interactable, Loot, Grow, Equipment, OwnTime, Flags, Ear, Build),
+ (Position, Visible, Controller, Movable, New, Removed, Moved, Player, Inventory, Health, Serialise, RoomExit, Entered, TriggerBox, Trap, Fighter, Healing, Volatile, ControlCooldown, Autofight, MonsterAI, Home, AttackInbox, Item, Spawner, Clan, Faction, Interactable, Loot, Grow, Equipment, TimeOffset, Flags, Ear, Build),
(Ground, Input, Output, Size, Spawn, Players, Emigration, Time)
);
diff --git a/src/systems/building.rs b/src/systems/building.rs
index 8459144..0f23467 100644
--- a/src/systems/building.rs
+++ b/src/systems/building.rs
@@ -13,7 +13,7 @@ use crate::{
Build,
Trigger,
TriggerBox,
- OwnTime
+ TimeOffset
},
resources::{NewEntities},
};
@@ -26,18 +26,18 @@ impl <'a> System<'a> for Building{
Write<'a, NewEntities>,
ReadStorage<'a, TriggerBox>,
ReadStorage<'a, Build>,
- ReadStorage<'a, OwnTime>
+ ReadStorage<'a, TimeOffset>
);
- fn run(&mut self, (positions, mut new, triggerboxes, builds, own_times): Self::SystemData) {
- for (position, triggerbox, build, own_time) in (&positions, &triggerboxes, &builds, (&own_times).maybe()).join(){
+ fn run(&mut self, (positions, mut new, triggerboxes, builds, time_offsets): Self::SystemData) {
+ for (position, triggerbox, build, time_offset) in (&positions, &triggerboxes, &builds, (&time_offsets).maybe()).join(){
for message in triggerbox.messages.iter() {
match message {
Trigger::Build | Trigger::Change => {
// todo: better error handling
let mut preent = new.encyclopedia.construct(&build.obj).unwrap();
- if let Some(time) = own_time {
- preent.push(ComponentWrapper::OwnTime(time.clone()));
+ if let Some(time) = time_offset {
+ preent.push(ComponentWrapper::TimeOffset(time.clone()));
}
new.to_build.push((position.pos, preent));
}
diff --git a/src/systems/growth.rs b/src/systems/growth.rs
index b1b1af5..3baa3e8 100644
--- a/src/systems/growth.rs
+++ b/src/systems/growth.rs
@@ -12,7 +12,7 @@ use specs::{
use crate::{
components::{
Grow,
- OwnTime,
+ TimeOffset,
TriggerBox
},
resources::{Time}
@@ -26,22 +26,25 @@ impl <'a> System<'a> for Growth{
WriteStorage<'a, Grow>,
WriteStorage<'a, TriggerBox>,
Read<'a, Time>,
- WriteStorage<'a, OwnTime>
+ WriteStorage<'a, TimeOffset>
);
- fn run(&mut self, (entities, mut grows, mut triggerboxes, time, mut own_times): Self::SystemData) {
+ fn run(&mut self, (entities, mut grows, mut triggerboxes, time, mut time_offsets): Self::SystemData) {
for (entity, grow) in (&entities, &mut grows).join(){
if grow.target_time == None {
- let creation_time = own_times.get(entity).map(|ct| ct.time).unwrap_or(time.time);
+ let creation_time = time.time + time_offsets.get(entity).map(|ct| ct.dtime).unwrap_or(0);
let duration = grow.delay as f64 * (1.0 + rand::random::<f64>()) / (if rand::random() {1.0} else {2.0});
grow.target_time = Some(creation_time + duration as i64);
}
let target_time = grow.target_time.unwrap();
if target_time <= time.time {
- if target_time + 1 < time.time {
- own_times.insert(entity, OwnTime{time: target_time + 1}).unwrap();
+ if target_time < time.time {
+ time_offsets.insert(entity, TimeOffset{dtime: target_time.0 - time.time.0}).unwrap();
+ } else {
+ time_offsets.remove(entity);
}
TriggerBox::add_message(&mut triggerboxes, entity, grow.trigger);
+ grow.target_time = None;
}
}
}
generated by cgit (git 2.34.1) at 2026-05-31 23:34:48 +0000