4532 Commits

Author SHA1 Message Date
Sveinung Kvilhaugsvik
2bfb51fae3 Merge pull request #403 from kvilhaugsvik/server_update
Update to Freeciv server freeciv/freeciv@4add33c
2021-06-03 01:19:29 +02:00
Sveinung Kvilhaugsvik
99f16dcf75 Update to Freeciv server freeciv/freeciv@4add33c249
Freeciv commit message:
Add Action "Wipe Units"

Wipe Units wipes all the units from the target tile if none
of them has positive defense value. This applies even when
stack death does not usually apply.

Requested by Alexandro Ignatiev

See hrm Feature #864356

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-06-03 00:24:55 +02:00
Sveinung Kvilhaugsvik
b70e00a3fd Update to Freeciv server freeciv/freeciv@a4b7021cbc
Freeciv commit message:
Add achievement type Killer

See hrm Feature #823396

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-06-03 00:21:37 +02:00
Sveinung Kvilhaugsvik
f4b9643d8d Update to Freeciv server freeciv/freeciv@3055430539
Freeciv commit message:
Clean out "Reserved" unit type flags

See osdn #41855

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-06-03 00:17:52 +02:00
Sveinung Kvilhaugsvik
619d4a7415 Update to Freeciv server freeciv/freeciv@9ffe3bc075
Freeciv commit message:
Add "CityDefensePct" combat bonus type

Implement type-specific combat bonuses in cities that override
"Defend_Bonus" effect.

See hrm Feature #865084

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-06-03 00:06:58 +02:00
Sveinung Kvilhaugsvik
6ae6e73f69 Update to Freeciv server freeciv/freeciv@a56144bd28
Freeciv commit message:
Make generated random seed less predictable

Patch by Ilkka Virta and myself

See hrm Feature #914184

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-06-02 23:56:24 +02:00
Sveinung Kvilhaugsvik
95bc5b8a7d Update to Freeciv server freeciv/freeciv@e9d398d100
Freeciv commit message:
Add ruleset control of unlimited airlift without capacity

Add ruleset entries airlift_from_always_enabled and
airlift_to_always_enabled. These are consulted when server
setting airliftingstyle sets airlifts to unlimited, and
there is no airlift capacity at all.
The old hardcoded behavior of 'from' requiring airlift capacity
and 'to' not requiring it are the default.

Requested by Lexxie

See hrm Bug #874937

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-06-02 23:53:51 +02:00
Sveinung Kvilhaugsvik
f82180ffa5 Merge pull request #402 from kvilhaugsvik/server_update
Update to Freeciv server freeciv/freeciv@67383de
2021-05-31 09:54:46 +02:00
Sveinung Kvilhaugsvik
83fec678ab Update to Freeciv server freeciv/freeciv@67383deed6
Freeciv commit message:
Correct wrong moves_actor_kind.

The actions "Investigate City" and "Establish Embassy" doesn't do diplomat
escape. The actor unit stays in place.

Set their moves_actor_kind to MAK_STAYS rather than MAK_ESCAPE. Don't charge
all movement as the spy escape cost.

See osdn #41811
2021-05-31 09:08:34 +02:00
Sveinung Kvilhaugsvik
95341068d3 Update to Freeciv server freeciv/freeciv@13e2ce6be1
Freeciv commit message:
Replace hut_behavior with HutFrighten.

The HutFrighten unit class flag serves as an anchor that should be pulled
when frightening and entering a hut at the same tile is supported.

The user unit class flag "HutNothing" is used where hut_behavior may have
been "Nothing".

See hrm Feature #923073
2021-05-31 09:06:12 +02:00
Sveinung Kvilhaugsvik
451b4e8690 Update to Freeciv server freeciv/freeciv@2ebd37750b
Freeciv commit message:
Deduplicate "Establish Embassy" move costs.

Doing post "Establish Embassy" escape to a nearby city spends all remaining
MP. There is no point in also subtracting 1 move fragment for doing the
action.

Reported by Marko Lindqvist <cazfi74@gmail.com>

See osdn #41765
2021-05-31 09:00:43 +02:00
Sveinung Kvilhaugsvik
130ec80623 Update to Freeciv server freeciv/freeciv@2ead4127a5
Freeciv commit message:
New effect Heal_Unit_Pct.

Make how much of the unit's full health the heal unit action will restore
ruleset controlled.

See osdn #41789
2021-05-31 08:58:31 +02:00
Sveinung Kvilhaugsvik
c96fd167d5 Update to Freeciv server freeciv/freeciv@ee41dbb421
Freeciv commit message:
New action "Unit Make Homeless".

See osdn #41622
2021-05-31 08:56:34 +02:00
Sveinung Kvilhaugsvik
3206d426af Update to Freeciv server freeciv/freeciv@547fb33c2d
Freeciv commit message:
Improve Action_Success_Actor_Move_Cost effect entries style in rulesets

See osdn #41760

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-05-31 08:52:54 +02:00
Sveinung Kvilhaugsvik
605604a2dc Update to Freeciv server freeciv/freeciv@00014ef249
Freeciv commit message:
Introduce ruleset defined effects.

Add 4 user effects. They can be given meaning by the ruleset from Lua.

See gna patch #2979
See osdn #41745
2021-05-31 08:49:50 +02:00
Sveinung Kvilhaugsvik
f00edb428a Update to Freeciv server freeciv/freeciv@6aa73f1a1c
Freeciv commit message:
Make unit combat bonus value signed 16bit in network protocol

Requested by Alexandro Ignatiev

See hrm Bug #922007

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-05-31 08:47:29 +02:00
Sveinung Kvilhaugsvik
ad0cd6db15 Update to Freeciv server freeciv/freeciv@fb2590a958
Freeciv commit message:
"Unit May Embark" action sub result.

Introduce the new action sub result "Unit May Embark". It is true if a unit
may end up loading into a transport at the target tile if it can't survive
there on its own.

Represent civstyle.paradrop_to_transport internally - the ruleset
representation remains the same - by setting "Unit May Embark" for the
paradrop actions.

See osdn #41739
2021-05-31 08:45:51 +02:00
Sveinung Kvilhaugsvik
2b0fcdde90 Update to Freeciv server freeciv/freeciv@b98e12e9bd
Freeciv commit message:
Make city culture values 32bit in network protocol

See osdn #41706

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-05-31 08:43:00 +02:00
Andreas Rosdal
f57a4534bf Add exception handling to PBEM savegame reading. 2021-05-30 09:13:56 +01:00
Andreas Røsdal
b96ddeaa17 Fix Docker build, by using Java 11. 2021-05-25 22:36:11 +01:00
Andreas Røsdal
d7cae3ac9e Remove additional repo for Java 11 stuff. 2021-05-24 17:31:14 +01:00
Andreas Rosdal
dd1cbea8d8 Update deb.sh 2021-05-23 23:47:13 +02:00
Andreas Rosdal
9d64582fe4 Update ci.yml 2021-05-23 23:40:58 +02:00
Andreas Rosdal
2c803aef98 Update ci.yml 2021-05-23 23:37:52 +02:00
Andreas Rosdal
d41f165cf8 Update deb.sh 2021-05-23 23:33:17 +02:00
Andreas Rosdal
3a3329462d Update pom.xml 2021-05-23 23:30:27 +02:00
Andreas Røsdal
6a6a7100de Update platform.js. 2021-05-23 20:05:03 +01:00
Andreas Røsdal
7c213e5c4a Remove json3.min.js. 2021-05-23 19:56:57 +01:00
Andreas Røsdal
13c31b093b Update to Tornadoweb 6.1 2021-05-23 19:50:34 +01:00
Andreas Røsdal
8eebc8f731 Update vagrant to use Ubuntu hirsute. 2021-05-23 19:06:02 +01:00
Andreas Rosdal
af81738fb7 Update README.md 2021-05-21 17:19:12 +02:00
Andreas Rosdal
580222eb9b Merge pull request #400 from kvilhaugsvik/server_update
Update to Freeciv server freeciv/freeciv@bc6e1692b2
2021-05-20 16:47:15 +02:00
Sveinung Kvilhaugsvik
bb9180dafe Update to Freeciv server freeciv/freeciv@bc6e1692b2
Freeciv commit message:
Split "Paradrop Unit"

Reduce the number of paradrop side effects by splitting the new actions
"Paradrop Unit Conquer", "Paradrop Unit Frighten",
"Paradrop Unit Frighten Conquer", "Paradrop Unit Enter" and
"Paradrop Unit Enter Conquer" from "Paradrop Unit".

City conquest and extra conquest ended up in the same actions to keep the
number of new actions down. They can be split later on ruleset author
request.

Allows more fine grained control over Paradrop side effects.
Enables simplifications and clean ups already half done.

See osdn #41565
2021-05-20 15:37:08 +02:00
Andreas Rosdal
e40ad5f12f Merge pull request #399 from kvilhaugsvik/util
Make action result more usable in Freeciv-web.
2021-05-20 15:12:24 +02:00
Sveinung Kvilhaugsvik
b7d76b3bda Introduce utype_can_do_action_result().
It is an action result version of utype_can_do_action().
2021-05-20 14:38:00 +02:00
Sveinung Kvilhaugsvik
9bf3d8b2e4 Introduce action_has_result(). 2021-05-20 14:37:59 +02:00
Sveinung Kvilhaugsvik
99811d6cda Introduce action_by_number(). 2021-05-20 14:35:52 +02:00
Sveinung Kvilhaugsvik
2eaa118020 Separate actions.js from action_dialog.js
The received actions aren't specific to the action selection dialog.
2021-05-20 14:21:38 +02:00
Andreas Rosdal
a81c448c35 Merge pull request #398 from kvilhaugsvik/server_update
Update to Freeciv server freeciv/freeciv@a06227a
2021-05-20 14:11:44 +02:00
Sveinung Kvilhaugsvik
e7632146af Update to Freeciv server freeciv/freeciv@a06227ac86
Freeciv commit message:
Add event type "Infrapoints"

See osdn #41690

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-05-20 12:58:04 +02:00
Sveinung Kvilhaugsvik
e6ed4569f0 Update to Freeciv server freeciv/freeciv@67d95f4f33
Freeciv commit message:
Nuke action min distance to to the ruleset.

Move the minimum distance between the action and target for the actions
"Explode Nuclear", "Nuke City" and "Nuke Units" to the ruleset.

See osdn #41701
2021-05-20 12:57:41 +02:00
Sveinung Kvilhaugsvik
b84f2ed9c3 Update to Freeciv server freeciv/freeciv@c34751a624
Freeciv commit message:
Add "Convert" improvement genus for coinage-like improvements

See hrm Feature #921525
2021-05-20 12:57:41 +02:00
Sveinung Kvilhaugsvik
dbe17feb2e Update to Freeciv server freeciv/freeciv@591c1d9d86
Freeciv commit message:
Ruleset configurable nuclear blast radius.

Introduce the new effect Nuke_Blast_Radius_1_Sq to control the size of a
nuclear explosion's blast radius.

Named like that to make room for an inner and an outer blast radius.

Uses the existing nuclear explosion animation for all blast sizes.

See hrm Feature #854166
2021-05-20 12:57:41 +02:00
Sveinung Kvilhaugsvik
97b16f532b Update to Freeciv server freeciv/freeciv@8527909427
Freeciv commit message:
Increase the number of legal reqs.

Our ruleset upgrade code can add new requirements to existing requirement
vectors. But requirement vectors can't be more than 20 requirements long.
The existing requirement vector may already be that long.

Increase the number of legal requirements in a requirement vector to 40,
doubling it.

See osdn #41661
2021-05-20 12:57:41 +02:00
Sveinung Kvilhaugsvik
d4cfaa6e12 Update to Freeciv server freeciv/freeciv@ba2f7bb76a
Freeciv commit message:
Make player culture values 32bit value in network protocol

Reported by mortmann

See osdn #41654

(Signed-off-by line removed from FCW commit message to avoid confusion)
2021-05-20 12:57:15 +02:00
Sveinung Kvilhaugsvik
e61492498f Update to Freeciv server freeciv/freeciv@c4f03f245a
Freeciv commit message:
Unit stack death escape: respect the move rules.

See hrm Bug #920206
2021-05-20 12:40:11 +02:00
Sveinung Kvilhaugsvik
248e84a2c3 Update to Freeciv server freeciv/freeciv@39578de7ab
Freeciv commit message:
"Attack" move cost to the ruleset.

Move the move cost of non OneAttack attacks to the ruleset too.

See osdn #41646
2021-05-20 12:40:11 +02:00
Sveinung Kvilhaugsvik
0e3c30964b Update to Freeciv server freeciv/freeciv@cf3f612f56
Freeciv commit message:
Action escape movement cost to the ruleset.

Move the movement cost of escaping to the nearest city after performing a
spy action to the ruleset.

See osdn #41628
2021-05-20 12:39:22 +02:00
Andreas Rosdal
8d08696cea Merge pull request #397 from kvilhaugsvik/server_update
Update to Freeciv server freeciv/freeciv@b3b07c5
2021-05-20 11:52:34 +02:00
Sveinung Kvilhaugsvik
0fadfb3a95 Update to Freeciv server freeciv/freeciv@05af62064f
Freeciv commit message:
Action sub results.

Add the field sub_results to the action struct. It is for side effects that
happens on top of the action result.

Add "Unit Enter Hut" and "Unit Frighten Hut" as the first action sub
results. Move the parts of the corresponding action results that can be
moved to the action sub results.

See osdn #41610
2021-05-20 11:21:34 +02:00