Skip to content

Spike/addons/settlers iv mining #1501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

Spike/addons/settlers iv mining #1501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a778a07
AI: do no longer treat inexhaustible granite mines like it was intend…
Spikeone Feb 19, 2022
088db97
Addons: Add options for each mine type for changing the behavior
Spikeone Feb 19, 2022
174c99b
use one base class for mining overhaul addons
Spikeone Feb 21, 2022
33bd9ab
use enum
Spikeone Feb 21, 2022
3c20586
fixup local build failing due to includes, remove workplace changes
Spikeone Feb 21, 2022
40a9160
rework coding for settlers iv like mining, remove some magic numbers
Spikeone Feb 21, 2022
4e5a182
add new line in mapbase.cpp
Spikeone Feb 28, 2022
65f7e39
rename numPointsRadius to GetNumPointsInRadius to match other naming,…
Spikeone Feb 28, 2022
a25a950
rename new consts
Spikeone Feb 28, 2022
833f17a
remove unused include
Spikeone Feb 28, 2022
bf302f2
move include
Spikeone Feb 28, 2022
df850e3
improve main implementation
Spikeone Feb 28, 2022
8d58bd5
improve addon description
Spikeone Feb 28, 2022
b44986b
add saving and loading of isAlteredWorkcycle
Spikeone Feb 28, 2022
ae9e40f
ctrl + k, ctrl + d for all files that failed formatting tests
Spikeone Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libs/s25main/GlobalGameSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ void GlobalGameSettings::registerAllAddons()
AddonBurnDuration,
AddonCatapultGraphics,
AddonChangeGoldDeposits,
AddonMinesGranite,
AddonMinesGold,
AddonMinesIron,
AddonMinesCoal,
AddonCharburner,
AddonCoinsCapturedBld,
AddonCustomBuildSequence,
Expand All @@ -92,6 +88,10 @@ void GlobalGameSettings::registerAllAddons()
AddonMilitaryAid,
AddonMilitaryControl,
AddonMilitaryHitpoints,
AddonMiningOverhaulCoal,
AddonMiningOverhaulGold,
AddonMiningOverhaulGranite,
AddonMiningOverhaulIron,
AddonMoreAnimals,
AddonNoAlliedPush,
AddonNoCoinsDefault,
Expand Down
27 changes: 0 additions & 27 deletions libs/s25main/addons/AddonMinesCoal.h
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions libs/s25main/addons/AddonMinesGold.h
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions libs/s25main/addons/AddonMinesGranite.h
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions libs/s25main/addons/AddonMinesIron.h
View file
Open in desktop

This file was deleted.

52 changes: 52 additions & 0 deletions libs/s25main/addons/AddonMiningOverhaul.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
//
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include "AddonList.h"
#include "mygettext/mygettext.h"

class AddonMiningOverhaulBase : public AddonList
Copy link
Member

@Flamefire Flamefire Feb 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this lengthy name (here and in the name)? How would you translate it (to German)?

I mean:

  • Name: "Mining overhaul: Coal"
  • Description: "This addon lets you control mining behavior"

This is why I suggested "Mining behavior" thinking about how it will look in the (already long) list of addons with their currently active setting in the window: "Mining behavior (coal): No change" vs "Mining overhaul: Coal: No Change"

PS: Funny how the roles are reversed for once: You thinking like a developer, me like a user :D

Copy link
Member Author

@Spikeone Spikeone Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this lengthy name (here and in the name)? How would you translate it (to German)?

AddonZumAnpassenDerBergwerklogik :D

I'm not so happy with the behavior anymore. This somewhat more feels like something visible, possibly a worker. Like how does a soldier behave when his home building is lost, does he return, does he wander around. Overhaul implied some change of logic, which is often invisible and just like "physics", you feel the result but can't grab the reason itself - it's just the way it is. Can change the name if you don't agree to that though :)

"Mining behavior (coal): No change" vs "Mining overhaul: Coal: No Change"

I don't see where this Representation comes from, as there is no textual representation that way as values are highlighted by the right column. So I rather see Mining behavior (coal) vs Mining overhaul: coal where I liked the second version more, besides the discussion if it should be overhaul or behavior. Anyway, I don't care that much for the name in the window (except lenghty names like "Number of scouts required fore exploration expedition"). So same here, can change the name if you'd like me to :)

Copy link
Member

@Flamefire Flamefire Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see where this Representation comes from, as there is no textual representation that way

I mean the Addon settings window. Currently it really reads (to me) like Addon title: Current setting. E.g. "Economy mode game length: 120min" and I kinda like that. I.e. a list that reads like plain English for every row so you understand it easily even when not reading the hint.

AddonZumAnpassenDerBergwerklogik :D

Ouch :D Seriously, I have that settings window in mind and try to imagine how it would look there.

So I rather see Mining behavior (coal) vs Mining overhaul: coal where I liked the second version more, besides the discussion if it should be overhaul or behavior.

I'd really like "behavior" better for a setting. Yes you are right with the description of "overhaul" but (at least to me) "overhaul" is the process of changing the behavior. I.e. reimplementing a part of the game to be "better" (performance, crash-resistance, ...). E.g. we need an overhaul of the save/load system as the current one sucks and crashes on big maps ;-)

As for the setting: This is something you change when selecting an option. And that option doesn't "overhaul" something but changes its "behavior".

Maybe we haven't found a good name yet. I mean what it changes is the behavior of the mines regarding resources. So maybe "Resource usage by mines: Coal". But that still doesn't fully hit it. It misses that the miner may produce nothing for a cycle. That's why I was asking for the German name. Just another way to think about it to come up with a nice flashy name for this :)

So I'd say come up with an English and German name here, maybe ask in Discord if anyone else has ideas, and check how it looks like in the Addon window before we finalize the name. So it is at least as good as possible in English and German ;-)

My current favourite is still "behavior", similar to what we have for the toolmaker: "Behavior [...]: ProduceNothing | ProduceRandom"

Copy link
Contributor

@falbrechtskirchinger falbrechtskirchinger Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I may add my 2 cents:

First, on "mine" vs "mining":

  • "Mining overhaul", as the act of mining is being overhauled.
  • "Mine behavior", as behavior applies to the exhaustion of the mine.

Personally, I'd use "Mine exhaustion (Coal)"/"Minenerschöpfung (Kohle)". Also, note the parentheses. Otherwise, you'd end up with an awkward double-colon when writing out settings: "Mine exhaustion: Coal: Default"

An alternative might be "Mine productivity"/"Minenergiebigkeit". I don't like it but maybe it sparks someone else's idea.

{
protected:
AddonMiningOverhaulBase(AddonId addonId, const std::string& addonName)
: AddonList(addonId, AddonGroup::Economy, addonName,
_("This addon lets you control mining behavior.\n\n"
"No change: Original behavior\n"
"Settlers IV: Mines never deplete. Range is decreased to 1. Chance for production depends on "
"resource amount in range.\n"
"Inexhaustible: Mines never deplete\n"
"Everywhere: Mines never deplete, can mine everywhere"),
{
_("No change"),
_("Settlers IV"),
_("Inexhaustible"),
_("Everywhere"),
})
{}
};

class AddonMiningOverhaulCoal : public AddonMiningOverhaulBase
{
public:
AddonMiningOverhaulCoal() : AddonMiningOverhaulBase(AddonId::MINING_OVERHAUL_COAL, _("Mining overhaul: Coal")) {}
};

class AddonMiningOverhaulGold : public AddonMiningOverhaulBase
{
public:
AddonMiningOverhaulGold() : AddonMiningOverhaulBase(AddonId::MINING_OVERHAUL_GOLD, _("Mining overhaul: Gold")) {}
};

class AddonMiningOverhaulGranite : public AddonMiningOverhaulBase
{
public:
AddonMiningOverhaulGranite() : AddonMiningOverhaulBase(AddonId::MINING_OVERHAUL_GRANITE, _("Mining overhaul: Granite")) {}
};

class AddonMiningOverhaulIron : public AddonMiningOverhaulBase
{
public:
AddonMiningOverhaulIron() : AddonMiningOverhaulBase(AddonId::MINING_OVERHAUL_IRON, _("Mining overhaul: Iron")) {}
};
5 changes: 1 addition & 4 deletions libs/s25main/addons/Addons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@
#include "addons/AddonSeaAttack.h"

#include "addons/AddonInexhaustibleGraniteMines.h"
#include "addons/AddonMinesGranite.h"
#include "addons/AddonMinesGold.h"
#include "addons/AddonMinesIron.h"
#include "addons/AddonMinesCoal.h"
#include "addons/AddonMiningOverhaul.h"

#include "addons/AddonBattlefieldPromotion.h"
#include "addons/AddonBurnDuration.h"
Expand Down
6 changes: 2 additions & 4 deletions libs/s25main/addons/const_addons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ ENUM_WITH_STRING(AddonId, LIMIT_CATAPULTS = 0x00000000, INEXHAUSTIBLE_MINES = 0x

INEXHAUSTIBLE_GRANITEMINES = 0x00800000,

MINES_GRANITE = 0x00800001,
MINES_GOLD = 0x00800002,
MINES_IRON = 0x00800003,
MINES_COAL = 0x00800004,
MINING_OVERHAUL_COAL = 0x00800001, MINING_OVERHAUL_GOLD = 0x00800002,
MINING_OVERHAUL_GRANITE = 0x00800003, MINING_OVERHAUL_IRON = 0x00800004,

MAX_RANK = 0x00900000, SEA_ATTACK = 0x00900001, INEXHAUSTIBLE_FISH = 0x00900002,
MORE_ANIMALS = 0x00900003, BURN_DURATION = 0x00900004, NO_ALLIED_PUSH = 0x00900005,
Expand Down
9 changes: 5 additions & 4 deletions libs/s25main/figures/nofMiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ unsigned int nofMiner::GetAddonSetting() const

switch(workplace->GetBuildingType())
{
case BuildingType::GoldMine: return settings.getSelection(AddonId::MINES_GOLD);
case BuildingType::IronMine: return settings.getSelection(AddonId::MINES_IRON);
case BuildingType::CoalMine: return settings.getSelection(AddonId::MINES_COAL);
case BuildingType::GraniteMine: return settings.getSelection(AddonId::MINES_GRANITE);
case BuildingType::GoldMine: return settings.getSelection(AddonId::MINING_OVERHAUL_GOLD);
case BuildingType::IronMine: return settings.getSelection(AddonId::MINING_OVERHAUL_IRON);
case BuildingType::CoalMine: return settings.getSelection(AddonId::MINING_OVERHAUL_COAL);
case BuildingType::GraniteMine: return settings.getSelection(AddonId::MINING_OVERHAUL_GRANITE);
default: return 0;
}
}
Expand Down Expand Up @@ -135,6 +135,7 @@ bool nofMiner::StartWorking()
{
// failed, use food and start working - but produce nothing
workplace->is_emptyCycle = true;
//ProduceWare = boost::none;
} else
{
// if success, use 1 quantity if any
Expand Down