Skip to content

Commit

Permalink
Update entity weight
Browse files Browse the repository at this point in the history
The intent was that the entities are not transportable via magic, via
transport or via the underworld, so that they cannot be moved around
except via overland/ships. However, I had mistakenly set their weight
such that high level portal lore and teleport could be used to move
them. The easiest fix was to up their weight so that this becomes
impossible, though the side effect is they now require more ships to
transport. This shouldn't be a problem however in the scheme of things
as they larger ships can handle them in a reasonable number and even
the smaller ships can do it, with enough of them in the fleet.
  • Loading branch information
jt-traub committed Sep 29, 2024
1 parent 231d81e commit ab0b09b
Show file tree
Hide file tree
Showing 29 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions gamedata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2347,8 +2347,8 @@ ItemType id[] =
ItemType::MAINTENANCE | ItemType::SEEK_ALTAR | ItemType::NO_SHAFT,
NULL,0,0,0, {{-1,0},{-1,0},{-1,0},{-1,0}},
NULL,0,0, {{-1,0},{-1,0},{-1,0},{-1,0}},
3000,IT_SPECIAL | IT_NEVER_SPOIL,1000,0,
3000,3000,0,0,2,
6000,IT_SPECIAL | IT_NEVER_SPOIL,1000,0,
6000,6000,0,0,2,
-1,0,
-1,0, 0,
0, NULL, 0,
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_0/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_0/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_1/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_1/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_10/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_10/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_11/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_11/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_12/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_12/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_13/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_13/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_2/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_2/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_3/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_3/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_4/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_4/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_5/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_5/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_6/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_6/report.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@
"tag": "DEVL"
},
{
"description": "imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"description": "imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2 hexes per month. This item prevents the unit it is with from being stealthy. This item prevents the unit it is with from entering a shaft. This item desires to move toward the nearest Ritual Altar. This item requires maintenance each turn of 1000 silver. Moving toward the altar will reduce the maintenance cost in half. Moving away from the altar will multiply the maintenance cost 5 time. This item cannot be given to other units.",
"name": "imprisoned entity",
"tag": "IENT"
}
Expand Down
2 changes: 1 addition & 1 deletion snapshot-tests/neworigins_turns/turn_7/report.1
Original file line number Diff line number Diff line change
Expand Up @@ -3363,7 +3363,7 @@ devil [DEVL], weight 250, walking capacity 50, riding capacity 50,
might have magic items and silver as treasure. A unit may have at
most 1 devil [DEVL].

imprisoned entity [IENT], weight 3000, can walk, can ride, moves 2
imprisoned entity [IENT], weight 6000, can walk, can ride, moves 2
hexes per month. This item prevents the unit it is with from being
stealthy. This item prevents the unit it is with from entering a
shaft. This item desires to move toward the nearest Ritual Altar.
Expand Down
Loading

0 comments on commit ab0b09b

Please sign in to comment.